Merge branch 'master' of http://139.159.178.92:8090/zhenglide/UbainsMeeting

# Conflicts:
#	app.js
#	pages/conference/ex_visitor/ex_visitor.axml
#	pages/conference/ex_visitor/ex_visitor.js

app.js

@@ -16,6 +16,8 @@ App({
     //domain:'http://id24iu.natappfree.cc',
     //domain:"http://dd2.ubainsyun.com",
    domain: "http://zhenglide.natapp1.cc" ,
+    domain:"http://dd2.ubainsyun.com",
+   //domain: "http://zhenglide.natapp1.cc" ,
     corpId: '',
     userId:'',
     person:'',

pages/conference/details/details.js

@@ -43,6 +43,7 @@ Page({
       conference: null
 
     })
+   //获取是否已添加外部人员记录
   
     dd.httpRequest({
       url: conferenceUrl,
@@ -80,6 +81,12 @@ Page({
 
   },
   onShow(query) {
+     dd.removeStorage({
+     key:'signList',
+     success:function(res){
+       console.log('清除已添加外部人员记录成功');
+     }
+   })
     // 页面显示
     // console.log("show会议室编号",query)
   },

pages/conference/ex_visitor/ex_visitor.axml

@@ -24,12 +24,15 @@
 </form>
 <scroll-view scroll-y="{{true}}">
     
+        <view  a:for="{{employeeList}}" a:for-item="employee" a:for-index="index" class='item-avatar-xs-a'>
         <view  a:for="{{signList}}" a:for-item="sign" a:for-index="index" class='item-avatar-xs-a'>
               <!-- <checkbox value="{{employee.name}}" checked="{{employee.checked}}" /> -->
-            <view data-index="{{index}}" data-id="{{sign.signId}}" onTap="deleteSign" class="del">                
+            <view data-index="{{index}}" data-id="{{employee.id}}" onTap="deleteSign" class="del">                
+            <view data-index="{{index}}" data-id="{{index }}" onTap="deleteSign" class="del">                
                  <icon  type="cancel" size="18" color="red"/>
             </view>
 
+              <text class="checkbox-text">{{employee.name}}</text>
               <text class="checkbox-text">{{sign.signName}}</text>
         </view> 
     

pages/conference/index/index.js

@@ -3,10 +3,10 @@ let app = getApp();
 let domain = app.globalData.domain;
 //获取用户信息的url
 let url = domain + "/dingding/login";
-let conferenceUrl = domain + "/dingding/conferenceList"
-let myinfoUrl = domain +"/dingding/myinfo"
-Page({
+let conferenceUrl = domain + "/dingding/conferenceList";
+let myinfoUrl = domain +"/dingding/myinfo";
 
+Page({
   data: {
     corpId: '',
     authCode: '',

pages/conference/visitor/visitor.js

@@ -255,6 +255,7 @@ Page({
     // 生命周期函数--监听页面加载
     var _this = this;
     var userId = app.globalData.userId
+    
     this.setData({
       mid:query.mid,
       cnum:query.cnum

pages/meeting/record/record.axml

@@ -69,7 +69,7 @@
                     <button class="btn1" a:if="{{mymessage.configValueId == 1}}" size='mini' type='primary'>正在会议</button>
                     <button class="btn1" a:if="{{mymessage.configValueId == 3}}" size='mini' type='warn'>暂停</button>
                     <button class="btn1" a:if="{{mymessage.configValueId == 2}}" size='mini' type='default'>未开始</button>
-                    <button class="btn2" size='mini' data-date="{{dates}}"  data-conference-name="{{mymessage.conference.conferenceName}}" data-message-password="{{mymessage.messagePassword}}"  data-mid="{{mymessage.messageId}}" data-minutesCode="{{conference.minutesCode}}" type='primary' onTap="meetjy">会议纪要</button>
+                    <button class="btn2" size='mini' data-date="{{dates}}"  data-conference-name="{{mymessage.conference.conferenceName}}" data-message-password="{{mymessage.messagePassword}}"  data-mid="{{mymessage.messageId}}" data-minutes-code="{{mymessage.conference.minutesCode}}" type='primary' onTap="meetjy">会议纪要</button>
                   </view>
                 </view>
                 <view class="tr">

pages/meeting/recording/recording.axml

@@ -24,7 +24,7 @@
       <view class="tr btn">
           <view class="td td1">
             <text>会议操作：</text>
-            <button class="btn1" size='mini' data-mid="{{history.messageId}}" data-minutesCode="{{conference.minutesCode}}" type='primary' onTap="summary">会议纪要</button>
+            <button class="btn1" size='mini' data-mid="{{history.messageId}}" data-minutes-code="{{history.conference.minutesCode}}" type='primary' onTap="summary">会议纪要</button>
             <button class="btn3" size='mini' data-mid="{{history.messageId}}" data-message-name="{{history.messageName}}" data-conference-name="{{history.conference.conferenceName}}"
              data-message-compere="{{history.messageCompere}}" data-topic-list="{{history.topicList}}" data-start-time="{{history.startTimeFormat}}" data-end-time="{{history.endTimeFormat}}"
               data-department="{{history.department}}" data-message-content="{{history.messageContent}}" data-config-value-id-string="{{history.configValueIdString}}"   type='default' onTap="details">详细信息</button>