From d7a7746840c089510fe0d9f7c4092e2136fce2bf Mon Sep 17 00:00:00 2001
From: educoder_weapp <educoder_weapp@126.com>
Date: Thu, 7 May 2020 11:03:45 +0800
Subject: [PATCH] =?UTF-8?q?A=20=E5=AE=9E=E8=AE=AD=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=A4=9A=E9=80=89=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 miniprogram/app.wxss                          |  13 ++++
 miniprogram/course/pages/course/course.wxml   |   1 +
 miniprogram/dev/pages/dev/dev.js              |   3 +-
 miniprogram/dev/pages/dev/dev.wxml            |   7 ++-
 miniprogram/dev/pages/dev/dev.wxss            |   9 +--
 miniprogram/images/enter.png                  | Bin 236 -> 0 bytes
 .../navigation-bar/navigaation-bar.wxml       |   2 +-
 miniprogram/js/apiConfig.js                   |   3 +-
 .../findmore/paths/path-item/path-item.wxml   |   2 +-
 miniprogram/pages/findmore/paths/paths.js     |   3 +-
 .../shixuns/shixun-item/shixun-item.js        |  29 ++++++++-
 .../shixuns/shixun-item/shixun-item.wxml      |   9 ++-
 .../shixuns/shixun-item/shixun-item.wxss      |  14 +++++
 miniprogram/pages/findmore/shixuns/shixuns.js |  58 +++++++++++++++++-
 .../pages/findmore/shixuns/shixuns.wxml       |  17 +++--
 .../pages/findmore/shixuns/shixuns.wxss       |  28 ++++++++-
 miniprogram/pages/home/home.wxml              |   2 +-
 project.config.json                           |   6 ++
 18 files changed, 178 insertions(+), 28 deletions(-)
 delete mode 100644 miniprogram/images/enter.png

diff --git a/miniprogram/app.wxss b/miniprogram/app.wxss
index 909bbdb..b3bc814 100644
--- a/miniprogram/app.wxss
+++ b/miniprogram/app.wxss
@@ -84,4 +84,17 @@ button[type=cap][disabled],button[type=main][disabled]{
 }
 button[plain][disabled]{
   background: transparent;
+}
+button[type=secondary]{
+  color: #00b0f0;
+  background: #f0f0f0;
+}
+button[type=error]{
+  background: #fa5151;
+  color: white;
+}
+button[type=error][plain]{
+  color: #fa5151;
+  border: 1px solid #fa5151;
+  background-color: transparent;
 }
\ No newline at end of file
diff --git a/miniprogram/course/pages/course/course.wxml b/miniprogram/course/pages/course/course.wxml
index d640d4d..5cc1bb7 100644
--- a/miniprogram/course/pages/course/course.wxml
+++ b/miniprogram/course/pages/course/course.wxml
@@ -64,6 +64,7 @@
 <error-page status="{{status}}" config="{{scenes}}" bindrefresh="onTapError" />
 <join-course hidden="{{!show_join_course}}" bindsuccess="refresh" auto_navigate="0" />
 <mp-halfScreenDialog show="{{showModules}}">
+	<text slot="title">课堂模块</text>
 	<view slot="desc" class="modules">
 		<view class="module-item" wx:for="{{course_modules}}" bindtap="onModuleTap" data-type="{{item.type}}">
 			<image class="module-img" mode="aspectFit" src="/course/images/svg/{{item.type}}_select.svg"></image>
diff --git a/miniprogram/dev/pages/dev/dev.js b/miniprogram/dev/pages/dev/dev.js
index 56d448b..e10230a 100644
--- a/miniprogram/dev/pages/dev/dev.js
+++ b/miniprogram/dev/pages/dev/dev.js
@@ -6,7 +6,8 @@ Page({
    */
   data: {
     scrollTop:0,
-    re:false
+    re:false,
+    type:"secondary"
   },
   onScanCode(e){
     console.log(e);
diff --git a/miniprogram/dev/pages/dev/dev.wxml b/miniprogram/dev/pages/dev/dev.wxml
index 8be2286..bc103a3 100644
--- a/miniprogram/dev/pages/dev/dev.wxml
+++ b/miniprogram/dev/pages/dev/dev.wxml
@@ -1,3 +1,4 @@
-<scroll-view class="scroll" scroll-top="scrollTop" refresher-triggered="{{re}}" refresher-enabled="1">
-  <button>撒</button>
-</scroll-view>
\ No newline at end of file
+
+<view>
+  <button type="{{type}}" plain size="mini">登录</button>
+</view>
\ No newline at end of file
diff --git a/miniprogram/dev/pages/dev/dev.wxss b/miniprogram/dev/pages/dev/dev.wxss
index 97fa6b9..37f466e 100644
--- a/miniprogram/dev/pages/dev/dev.wxss
+++ b/miniprogram/dev/pages/dev/dev.wxss
@@ -1,8 +1,3 @@
-#cam{
-  width: 100%;
-  height: 40vh;
-}
-.scroll{
-  background: red;
-  height: 72vh;
+page{
+  background: white;
 }
\ No newline at end of file
diff --git a/miniprogram/images/enter.png b/miniprogram/images/enter.png
deleted file mode 100644
index f4ab08b8c87eade4925f464681bb8c927471a05f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 236
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`n>}3|LoEE4Ubg09G8AcjSbRb&
zrtLx0vQ08u1dEubH8m}5VL9TYqZ`}(bjMteT?bEQ8~pu$cS1p@J%4@m+ONG&f;6v2
zXWN_BGj*KcJRo>r!IW27Cs;a!pDTDK@J(Wkny7T4DWuWR>C@Xe(Y^J{I1P@?apqv3
zr2jm|oLgWbcSEgKU%*GUsMp#jWA*fyls++BnEps7p{KG<;M!IT&W;nZ2bQUxV=NRG
kyZ1XccjBu48%#Bf-V6bP?(ajZfzD^}boFyt=akR{0HmE;0{{R3

diff --git a/miniprogram/includes/navigation-bar/navigaation-bar.wxml b/miniprogram/includes/navigation-bar/navigaation-bar.wxml
index 370d23f..da26154 100644
--- a/miniprogram/includes/navigation-bar/navigaation-bar.wxml
+++ b/miniprogram/includes/navigation-bar/navigaation-bar.wxml
@@ -6,7 +6,7 @@
 			<text class="title">{{title}}</text>
 		</view>
 		<view class="navbar" bindtap="switchNav">
-			<view class="navitem {{current==index?'active':''}}" wx:for="{{list}}" data-current="{{index}}">
+			<view class="navitem {{current==index?'active':''}}" wx:for="{{list}}" wx:key="text" data-current="{{index}}">
 				{{item.text}}
 			</view>
 		</view>
diff --git a/miniprogram/js/apiConfig.js b/miniprogram/js/apiConfig.js
index bb8b074..d47910e 100644
--- a/miniprogram/js/apiConfig.js
+++ b/miniprogram/js/apiConfig.js
@@ -39,7 +39,7 @@ courses:{ url:{_:"*", DELETE:"*/{course_id}",PUT:"*/{course_id}"},query, form:{_
   top_banner:{url:"{course_id}/*", query},
   set_invite_code_halt:{url:"{course_id}/*", query, config, disp:"停用或启用邀请码"},
   students:{url:"{course_id}/*",query, form:{order:1,sort:"asc",page:1, limit:20, course_group_id:""}},
-  search_slim:{},
+  search_slim:{query, form:{page:1, limit:10}},
   switch_to_assistant: { url: "{course_id}/*", query ,config},
   switch_to_student:{url:"{course_id}/*",query, config},
   switch_to_teacher:{url:"{course_id}/*",query, config},
@@ -117,6 +117,7 @@ search:{query,form:{type:null, keyword:null, page:1, per_page:20}, data:{type:"s
 shixun_lists: { query, form:{type:"all", status:"published",keyword:"",diff:0,order:"desc",page:1,limit:10,sort:"wechat_myshixuns_count", no_jupyter:1}},
 
 shixuns:{url:"*/{identifier}", query, res:{tpm_modified:"代码库是否有更新"},
+  batch_send_to_course:{query, config, form:{course_id:null, shixun_ids:null}},
   challenges:{url:"{identifier}/*", query},
   show_right:{url:""},
   shixun_exec:{url:"{identifier}/*", query},
diff --git a/miniprogram/pages/findmore/paths/path-item/path-item.wxml b/miniprogram/pages/findmore/paths/path-item/path-item.wxml
index 160f7e4..4d9a392 100644
--- a/miniprogram/pages/findmore/paths/path-item/path-item.wxml
+++ b/miniprogram/pages/findmore/paths/path-item/path-item.wxml
@@ -1,5 +1,5 @@
 <navigator class="path-item" url="/path/pages/path/path?subject_id={{data.id}}">
-  <image class="image" src="{{eduUrl}}/{{data.image_url}}"></image>
+  <image class="image" lazy-load src="{{eduUrl}}/{{data.image_url}}"></image>
   <view class="detail">
     <view class="name">{{data.name}}</view>
   </view>
diff --git a/miniprogram/pages/findmore/paths/paths.js b/miniprogram/pages/findmore/paths/paths.js
index f69db54..18e3205 100644
--- a/miniprogram/pages/findmore/paths/paths.js
+++ b/miniprogram/pages/findmore/paths/paths.js
@@ -78,7 +78,6 @@ Component({
       this.setData({[key]: list});
     },
     onCateChange({detail}){
-      console.log(detail);
       let {current, value} = detail;
       this.options.discipline_id = value.id;
       this.setNavList({disciplines: this.disciplines[current].sub_disciplines, key:"subList"});
@@ -87,10 +86,10 @@ Component({
       this.pullSubjects({refresh:1});
     },
     onSubCateChange({detail}){
-      console.log(detail);
       let {current, value, source} = detail;
       if(source!="touch")
         return;
+      this.setData({subCurrent:current});
       if(value.id)
         this.options.sub_discipline_id = value.id;
       else
diff --git a/miniprogram/pages/findmore/shixuns/shixun-item/shixun-item.js b/miniprogram/pages/findmore/shixuns/shixun-item/shixun-item.js
index 61b7dbf..db1e260 100644
--- a/miniprogram/pages/findmore/shixuns/shixun-item/shixun-item.js
+++ b/miniprogram/pages/findmore/shixuns/shixun-item/shixun-item.js
@@ -1,14 +1,37 @@
 
 Component({
   properties: {
-    data:Object
+    data:Object,
+    select: {
+      type: Boolean,
+      value: false,
+      observer: function(v){
+        //console.log("observer select change", v);
+        if(!v){
+          this.setData({value: false});
+          //console.log(this.data);
+        }
+      }
+    }
   },
-
+  behaviors: ['wx://form-field'],
   data: {
     eduUrl: global.config.eduUrl
   },
 
   methods: {
-
+    onTap(){
+      if(this.data.select){
+        this.select({from:"body"})
+      }
+    },
+    select({from}){
+      this.setData({value: !this.data.value});
+      let {data:{id:name}, value} = this.data;
+      this.triggerEvent("select", {name, value, from}, {bubbles:true});
+    },
+    onTapRadio(){
+      this.select({from:"radio"})
+    }
   }
 })
diff --git a/miniprogram/pages/findmore/shixuns/shixun-item/shixun-item.wxml b/miniprogram/pages/findmore/shixuns/shixun-item/shixun-item.wxml
index ea65652..78ca712 100644
--- a/miniprogram/pages/findmore/shixuns/shixun-item/shixun-item.wxml
+++ b/miniprogram/pages/findmore/shixuns/shixun-item/shixun-item.wxml
@@ -1,7 +1,12 @@
-<navigator class="shixun-item" url="/shixun/pages/shixun/shixun?identifier={{data.identifier}}">
-  <image class="image" src="{{eduUrl}}/{{data.pic}}"></image>
+<navigator bindtap="onTap" hover-class="{{select?'none':'navigator-hover'}}" class="shixun-item" url="{{select?'':('/shixun/pages/shixun/shixun?identifier='+data.identifier)}}">
+  <image class="image" lazy-load src="{{eduUrl}}/{{data.pic}}"></image>
   <view class="detail">
     <view class="name"><rich-text nodes="{{data.title}}"/></view>
     <view class="level">初级</view>
   </view>
+  <view class="radio-wrp">
+    <view class="icon-wrp" catchtap="onTapRadio" >
+      <icon class="icon" color="{{select&&value?'#00b0f0':'dimgrey'}}" type="{{value?'success':'circle'}}" size="{{select?20:12}}"></icon>
+    </view>
+  </view>
 </navigator>
\ No newline at end of file
diff --git a/miniprogram/pages/findmore/shixuns/shixun-item/shixun-item.wxss b/miniprogram/pages/findmore/shixuns/shixun-item/shixun-item.wxss
index e542b37..d238121 100644
--- a/miniprogram/pages/findmore/shixuns/shixun-item/shixun-item.wxss
+++ b/miniprogram/pages/findmore/shixuns/shixun-item/shixun-item.wxss
@@ -15,10 +15,24 @@
   display: flex;
   flex-direction: column;
   justify-content: space-between;
+  flex: auto;
 }
 .level{
   font-size: 12px;
 }
 .highlight{
   color: #00b0f0;
+}
+.radio-wrp,.icon-wrp{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.radio-wrp{
+  width: 22px;
+  flex: none;
+}
+.icon-wrp{
+  width: 100%;
+  height: 30px;
 }
\ No newline at end of file
diff --git a/miniprogram/pages/findmore/shixuns/shixuns.js b/miniprogram/pages/findmore/shixuns/shixuns.js
index 653e588..73bfd2b 100644
--- a/miniprogram/pages/findmore/shixuns/shixuns.js
+++ b/miniprogram/pages/findmore/shixuns/shixuns.js
@@ -11,6 +11,7 @@ Component({
   attached(){
     this.options = {page:1, limit: 10};
     this.pullShixuns({refresh:1});
+    this.selects = {};
   },
   methods: {
     clear(){
@@ -27,7 +28,59 @@ Component({
       }
       
     },
+    onChange(e){
+      console.log(e);
+    },
+    onSelect(e){
+      let {detail} = e;
+      console.log(detail);
+      this.selects[detail.name] = detail.value;
+      if(detail.value&&!this.data.select)
+        this.setData({select: true});
+      else if(!detail.value&&!this.data.select){
+        console.error("!!!!!!!!!!!!!!!");
+      }
+      else if(detail.from=='radio'){
+        let length = 0;
+        for(var i in this.selects){
+          if(this.selects[i])
+            length++;
+        }
+        console.log("length", length);
+        if(length==0){
+          this.setData({select: false});
+          this.selects = {};
+        }
+      }
+    },
+    onReset(e){
+      console.log(e, e.detail);
+      this.setData({select:false});
+      this.selects = {}
+    },
     onSubmit(e){
+      console.log(e,e.detail);
+      if(!this.data.select)
+        this.setData({select: true});
+      else{
+        let shixun_ids = [];
+        for(var i in this.selects){
+          if(this.selects[i])
+            shixun_ids.push(i);
+        }
+        console.log("selected shixuns", shixun_ids);
+        if(shixun_ids.length==0){
+          wx.showToast({
+            title: '请选择实训',icon:"none"
+          })
+        }else{
+          this.select_shixun_ids = shixun_ids;
+          this.setData({showSendDialog: true});
+        }
+        
+      }
+    },
+    search(e){
       console.log(e)
       let {detail:{value}} = e;
       if(this.options.keyword!=value){
@@ -66,7 +119,10 @@ Component({
         }
         this.setData({ shixun_list, status}, wx.hideNavigationBarLoading);
       }).catch(e=>{
-        this.setData({ shixun_list:[], status:e.code}, wx.hideNavigationBarLoading);
+        if(refresh)
+          this.setData({ shixun_list:[], status:e.code}, wx.hideNavigationBarLoading);
+        else
+          this.setData({status:e.code}, wx.hideNavigationBarLoading);
       })
     }
   }
diff --git a/miniprogram/pages/findmore/shixuns/shixuns.wxml b/miniprogram/pages/findmore/shixuns/shixuns.wxml
index dfece4f..2d05b33 100644
--- a/miniprogram/pages/findmore/shixuns/shixuns.wxml
+++ b/miniprogram/pages/findmore/shixuns/shixuns.wxml
@@ -4,14 +4,23 @@
   <view>
     <view class="header">
       <view class="input-wrp">
-        <input class="input" value="{{keyword}}" bindinput="onInput" bindblur="onSubmit" bindconfirm="onSubmit" confirm-type="search" placeholder="输入实训关键词进行搜索"></input>
+        <input class="input" value="{{keyword}}" bindinput="onInput" bindblur="search" bindconfirm="search" confirm-type="search" placeholder="输入实训关键词进行搜索"></input>
         <icon wx:if="{{showClear}}" class="icon" type="clear" bindtap="clear"></icon>
         <icon class="icon" type="search"></icon>
       </view>
     </view>
-    <view wx:for="{{shixun_list}}" class="shixun-wrp">
-      <shixun-item data="{{item}}"/>
-    </view>
+    <form bindsubmit="onSubmit" bindselect="onSelect" bindreset="onReset">
+      <view class="sticky-top list-header">
+        <view class="subtitle">实训列表</view>
+        <view class="select-operations">
+          <button wx:if="{{select}}" class="operation-btn cancel-select" form-type="reset">取消</button>
+          <button class="operation-btn submit-select" form-type="submit">{{select?'发送到':'发送'}}</button>
+        </view>
+      </view>
+      <view wx:for="{{shixun_list}}" wx:key="id" class="shixun-wrp">
+        <shixun-item data="{{item}}" name="{{item.id}}" select="{{select}}"/>
+      </view>
+    </form>
     <empty-page show="{{status==205}}" title="暂无相关内容" desc="获取更多请进入EduCoder官网"/>
   </view>
 </scroll-view>
\ No newline at end of file
diff --git a/miniprogram/pages/findmore/shixuns/shixuns.wxss b/miniprogram/pages/findmore/shixuns/shixuns.wxss
index b2efed1..a1203aa 100644
--- a/miniprogram/pages/findmore/shixuns/shixuns.wxss
+++ b/miniprogram/pages/findmore/shixuns/shixuns.wxss
@@ -1,9 +1,11 @@
 .shixun-body{
   height: 100%;
 }
-.header{
+.sticky-top{
   top: 0;
   position: sticky;
+}
+.header{
   background: white;
   padding: 4px 12px;
 }
@@ -19,6 +21,30 @@
 .icon{
   flex: none;
 }
+.list-header,.select-operations{
+  display: flex;
+  align-items: center;
+}
+.list-header{
+  background: white;
+  padding: 4px 12px;
+  border-bottom: #eee 1px solid;
+  margin-bottom: 2px;
+}
+.subtitle{
+  font-weight: bold;
+  white-space: pre;
+  flex: auto;
+}
+.operation-btn{
+  padding: 4px 10px;
+  width: auto!important;
+  background: transparent;
+  font-size: 14px;
+}
+.submit-select{
+  color: #00b0f0;
+}
 
 .shixun-wrp{
   margin-bottom: 2px;
diff --git a/miniprogram/pages/home/home.wxml b/miniprogram/pages/home/home.wxml
index bd68e6e..bb02ff6 100644
--- a/miniprogram/pages/home/home.wxml
+++ b/miniprogram/pages/home/home.wxml
@@ -72,7 +72,7 @@
 
 <view>
   <button class="login" type="main" wx:if="{{!user.id||user.id==2}}" bindtap="enter_login">登录</button>
-  <button class="login logout" wx:elif="{{user.id!=2}}" bindtap="logout">退出登录</button>
+  <button class="login logout" type="error" wx:elif="{{user.id!=2}}" bindtap="logout">退出登录</button>
 </view>
 
 <view class="version">
diff --git a/project.config.json b/project.config.json
index fb61e1e..fe7b99d 100644
--- a/project.config.json
+++ b/project.config.json
@@ -149,6 +149,12 @@
 					"pathName": "pages/findmore/findmore",
 					"query": "identifier=8bu9zmjy",
 					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "dev/pages/dev/dev",
+					"pathName": "dev/pages/dev/dev",
+					"scene": null
 				}
 			]
 		}