dd

src/common/api.js

@@ -161,5 +161,5 @@ export default {
   createtheme: {
     addTheme: `${dakaapi}member/subject`,
   },
-
+  getschooluuid: `${dakaapi}member/school_uuid`,
 };

src/components/InviteCodeDialog.js

@@ -11,13 +11,13 @@ class InviteCodeDialog extends React.Component {
     };
   }
   componentDidMount() { // 挂载
-    const clipboard = new ClipboardJS('#btnCopyLink'); // 点击按钮复制到粘贴板
-    clipboard.on('success', () => {
+    this.clipboard = new ClipboardJS('#btnCopyLink'); // 点击按钮复制到粘贴板
+    this.clipboard.on('success', () => {
       message.success('复制成功');
     });
   }
   componentWillUnmount() { // 卸载
-
+    this.clipboard.destroy();
   }
   render() {
     const {

src/models/students.js

@@ -990,8 +990,13 @@ export default {
     },
     * createInviteQrcode({ payload }, { call, put, select }) {
       const { sid } = yield select(state => state.webapp);
+      const scholluuidData = yield call(commonAjax.getschooluuid, {
+        school_id: sid,
+      });
+      console.log(scholluuidData, 'scholluuidData');
+      if (scholluuidData.code == 200) {
         const qrcodeData = yield call(commonAjax.generateQrcode, {
-        scene: `s=${sid}`,
+          scene: `s=${sid}uuid=${scholluuidData.data}`,
           page: 'src/pages/setting/bindmobile',
         });
         if (qrcodeData.code == 200) {
@@ -1006,6 +1011,7 @@ export default {
         } else {
           message.error('小程序码生成失败', 1);
         }
+      }
     },
   },
   reducers: {

src/pages/classmgt/classrRgistration.js

@@ -25,14 +25,14 @@ class ClassrRgistration extends React.Component {
     pageIn('班级管理');
     // 初始化地图函数  自定义函数名init
     // 定义map变量 调用 qq.maps.Map() 构造函数   获取地图显示容器
-    const clipboard = new ClipboardJS('#btnCopyLink'); // 点击按钮复制到粘贴板
-    clipboard.on('success', () => {
+    this.clipboard = new ClipboardJS('#btnCopyLink'); // 点击按钮复制到粘贴板
+    this.clipboard.on('success', () => {
       message.success('复制成功');
     });
   }
 
   componentWillUnmount() { // 卸载
-
+    this.clipboard.destroy();
   }
   componentWillReceiveProps(nextProps) {
   }

src/pages/student/index.js

@@ -40,6 +40,7 @@ class StudentMgt extends React.Component {
         },
       },
     },
+    isExpendMore: false,
   };
   componentDidMount() { // 挂载
     pageIn('学员管理');
@@ -516,6 +517,11 @@ class StudentMgt extends React.Component {
       },
     });
   }
+  expendMore = () => {
+    this.setState({
+      isExpendMore: !this.state.isExpendMore,
+    });
+  }
   render() {
     const { getFieldDecorator } = this.props.form;
     const {
@@ -563,7 +569,7 @@ class StudentMgt extends React.Component {
       inviteCodeShow,
       inviteCode,
     } = this.props;
-    const { qrCodeTitle } = this.state;
+    const { qrCodeTitle, isExpendMore } = this.state;
     const columns = [
       {
         title: '学员姓名',
@@ -676,7 +682,10 @@ class StudentMgt extends React.Component {
           {hasBtnPower('sjd/student', 'bundlingCode') && <Button id={pageStyle.headerself} className={pageStyle.headerbtn} onClick={() => this.inviteCodeDialogVisible(true)}>快捷邀请学员</Button>}
         </div>
         <div className={pageStyle.search}>
-          <div className={pageStyle.title}>学员搜索</div>
+          <div className={pageStyle.title}>
+            学员搜索
+            <div className={pageStyle.expendMore} onClick={this.expendMore}>{isExpendMore ? '收起' : '展开'}更多筛选选项 {isExpendMore ? '-' : '+'}</div>
+          </div>
           <div className={pageStyle.searchbox}>
             <Row
               gutter={{
@@ -711,6 +720,7 @@ class StudentMgt extends React.Component {
                 </Select>
               </Col>
             </Row>
+            {isExpendMore &&
               <Row
                 gutter={{
                   sm: 24, xs: 24, md: 24, lg: 24,
@@ -761,6 +771,7 @@ class StudentMgt extends React.Component {
                   <Button icon="download" className={pageStyle.downloadbtn} onClick={() => this.exportExcel(columns)} >导出</Button>
                 </Col>
               </Row>
+            }
           </div>
         </div>
         <div className={pageStyle.table}>

src/pages/student/index.less

@@ -30,7 +30,25 @@
     line-height:55px;
     padding-left: 32px;
     border-bottom: solid 1px rgba(233,233,233,1);
+    position: relative;
     // margin-bottom: 24px;
+    .expendMore{
+        position: absolute;
+        right: 24px;
+        top: 10px;
+        width:153px;
+        height:32px;
+        background:rgba(255,255,255,1);
+        border-radius:4px;
+        border:1px solid rgba(24,144,255,1);
+        line-height: 32px;
+        text-align: center;
+        font-size:14px;
+        color:rgba(24,144,255,1);
+        font-family:PingFangSC-Regular,PingFangSC;
+        font-weight:400;
+        cursor: pointer;
+    }
 }
 .tablebox {
     padding: 24px 34px 0;

src/pages/teacher/EditTeacher.js

@@ -84,11 +84,11 @@ class EditClassModal extends React.Component {
                     rules: [
                       {
                         required: true,
-                        message: '请输入账号',
+                        message: '请输入老师手机号',
                       },
-                      { pattern: /^1[3456789]{1}[0-9]{9}$/, message: '请输入正确账号!' },
+                      { pattern: /^1[3456789]{1}[0-9]{9}$/, message: '请输入正确手机号!' },
                     ],
-                  })(<Input style={{ width: 200 }} placeholder="请输入账号" />)}
+                  })(<Input style={{ width: 200 }} placeholder="请输入老师手机号" />)}
                 </Form.Item>
               }
               {editType == 'edit' &&

src/services/common.js

@@ -89,3 +89,10 @@ export function schoolLoginTime(params) {
     data,
   });
 }
+export function getschooluuid(params) {
+  const data = qs.stringify(params);
+  return request({
+    url: `${api.getschooluuid}?${data}`,
+    method: 'GET',
+  });
+}