aaa

app.js

@@ -13,7 +13,9 @@ App({
   },
   //全局数据
   globalData: {
-    domain:"https://dd2.ubainsyun.com",
+    //domain:'http://id24iu.natappfree.cc',
+    //domain:"http://dd2.ubainsyun.com",
+    domain: "http://zhenglide.natapp1.cc" ,
     corpId: '',
     userId:'',
     person:'',

pages/conference/addmeeting/addmeeting.js

@@ -21,6 +21,7 @@ Page({
     lists: [{}],
     text: '',
     cnum:'',
+    departments:'全体',
     allTime: {
       hours: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23],
       minutes: [0, 15, 30, 45]
@@ -164,16 +165,18 @@ var _this=this;
         cnum: _this.data.cnum,
         startTime: startTime,
         endTime: endTime,   
+        departments: _this.data.departments,     
         userId: app.globalData.userId,
         messageName: e.detail.value.messageName,
         messageCompere: e.detail.value.messageCompere,
+        messageTheme: e.detail.value.messageTheme,
         messageContent: e.detail.value.messageContent,
         remindMethod : e.detail.value.remindMethod,
         remindTime: e.detail.value.remindTime,
       },
       dataType: 'json',
       success: function(res) {
-    //   console.log('success----', res)
+      console.log('success----', res)
        
 
         if (res.data.success){

pages/conference/details/details.axml

@@ -17,7 +17,7 @@
         
             <view class="tr">
               <view class="td td1">会议名称：{{msg.messageName}}</view>
-              <view class="td td2">发起人：{{msg.manageUser.nickname}}</view>
+              <view class="td td2">发起人：{{msg.messageCompere}}</view>
             </view>
             
             <view class="tr">

pages/conference/details/details.js

@@ -23,12 +23,13 @@ Page({
     // document.getElementById(id).src = "../../../resource/images/list-room.png";
   
     var conference = this.data.conference;
+    if(conference!=null){
     if (conference.photoUrl)
     conference.photoUrl = "/images/conference/dd-defalut.png"
     this.setData({
       conference
     });
-  
+  }
   },
   onLoad: function(query) {
     // 生命周期函数--监听页面加载

pages/conference/ex_visitor/ex_visitor.acss

@@ -136,3 +136,6 @@ checkbox{
   float: left;
   margin-top: 5rpx;
 }
+.required{
+  color: red;
+}
\ No newline at end of file

pages/conference/ex_visitor/ex_visitor.axml

@@ -8,8 +8,8 @@
 <view class="graySpace"></view> -->
 <form onSubmit="formSubmit" onReset="">
   <view class='item-avatar-xs'>
-    <text>用户名：</text>
-      <input type="text" name="signName" placeholder="请输入用户名" />
+    <text><text class="required">*</text>用户名：</text>
+      <input type="text" name="signName" placeholder="请输入用户名" required="required" />
   </view>
   <view class='item-avatar-xs'>
     <text>手机号：</text>

pages/conference/ex_visitor/ex_visitor.js

@@ -21,50 +21,57 @@ Page({
 
 
      var _this = this;
-    if (e.detail.value.signMobile.length != 0) {
-      var phoneReg = /(^1[3|4|5|7|8]\d{9}$)|(^09\d{8}$)/;
-      var phone = e.detail.value.signMobile;
-      if (!phoneReg.test(phone)) {
+     if(e.detail.value.signName.length == 0){
         dd.alert({
-          title: "添加失败",
-          content: "手机格式错误",
+          title: "用户名不能为空",
           buttonText: '确定'
         })
         return false;
      }
+    // if (e.detail.value.signMobile.length != 0) {
+    //   var phoneReg = /(^1[3|4|5|7|8]\d{9}$)|(^09\d{8}$)/;
+    //   var phone = e.detail.value.signMobile;
+    //   if (!phoneReg.test(phone)) {
+    //     dd.alert({
+    //       title: "添加失败",
+    //       content: "手机格式错误",
+    //       buttonText: '确定'
+    //     })
+    //     return false;
+    //   }
+
+
+
+
+    // } else {
+    //   dd.alert({
+    //     title: "添加失败",
+    //     content: "手机不为空",
+    //     buttonText: '确定'
+    //   });
+    //   return false;
+    // }
+    // if (e.detail.value.signEmail.length!=0 ) {
+    // var  reg = /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/;
+    //   var email = e.detail.value.signEmail;
+    //   if (!reg.test(email)) {
+    //     dd.alert({
+    //       title: "添加失败",
+    //       content: "邮箱格式错误",
+    //       buttonText: '确定'
+    //     });
+    //     return false;
 
+    //   }
      
-
-
-    } else {
-      dd.alert({
-        title: "添加失败",
-        content: "手机不为空",
-        buttonText: '确定'
-      });
-      return false;
-    }
-    if (e.detail.value.signEmail.length!=0 ) {
-    var  reg = /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/;
-      var email = e.detail.value.signEmail;
-      if (!reg.test(email)) {
-        dd.alert({
-          title: "添加失败",
-          content: "邮箱格式错误",
-          buttonText: '确定'
-        });
-        return false;
-
-      }
-     
-    } else {
-      dd.alert({
-        title: "添加失败",
-        content: "邮箱不为空",
-        buttonText: '确定'
-      });
-      return false;
-    }
+    // } else {
+    //   dd.alert({
+    //     title: "添加失败",
+    //     content: "邮箱不为空",
+    //     buttonText: '确定'
+    //   });
+    //   return false;
+    // }
    
 
 

pages/conference/index/index.acss

@@ -23,7 +23,7 @@
 .banner image{
  width: 40rpx;
  height: 40rpx;
- margin: 10rpx 30rpx;
+ margin: 10rpx 10rpx 10rpx 60rpx;
 }
 .function_text{
   display: block;
@@ -38,7 +38,7 @@ white-space: nowrap;
   background: none;
   font-size: 0.3rem;
   position: absolute;
-  margin-top: 5rpx;
+  /* margin-top: 5rpx; */
 }
 .list_box{
   margin-top: 30rpx;

pages/login/login.acss

@@ -51,7 +51,7 @@
   border: 1px solid #eee;
 }
 .ver{
-   width: 45%;
+   width: 46%;
   height: 60rpx;
   line-height: 60rpx;
   position: absolute;

pages/meeting/details/details.acss

@@ -7,14 +7,19 @@
 }
 .row{
   width: 100%;
-  height: 80rpx;
+  height: auto;
   line-height: 80rpx;
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
   border-bottom: 1px solid #ccc;
 }
 .row label{
-  /* height: 80rpx; */
+  height: auto;
   line-height: 80rpx;
   display: inline-block;
   text-align: center;
   border-left: 1px solid #ccc;
+  word-wrap:break-word;
+  word-break: break-all;
 }

pages/meeting/details/details.axml

@@ -19,7 +19,7 @@
         </view>
         <view class="row">
           <label style="width:30%">会议议题</label>
-          <label style="width:68%">{{message.messageName}}</label>
+          <label style="width:68%">{{message.messageTheme}}</label>
         </view>
         <view class="row">
           <label style="width:30%">会议开始时间</label>

pages/meeting/details/details.js

@@ -12,6 +12,7 @@ Page({
     message['messageName']=query.messageName;
     message['conferenceName'] = query.conferenceName;
     message['messageCompere'] = query.messageCompere;
+    message['messageTheme'] = query.messageTheme;
     message['startTime'] = query.startTime;
     message['endTime'] = query.endTime;
     message['department'] = query.department;

pages/meeting/recording/recording.axml

@@ -23,7 +23,7 @@
             <text>会议操作：</text>
             <button class="btn1" size='mini' data-mid="{{history.messageId}}" type='primary' onTap="summary">会议纪要</button>
             <button class="btn3" size='mini' data-message-name="{{history.messageName}}" data-conference-name="{{history.conference.conferenceName}}"
-             data-message-compere="{{history.messageCompere}}" data-start-time="{{history.startTimeFormat}}" data-end-time="{{history.endTimeFormat}}"
+             data-message-compere="{{history.messageCompere}}" data-message-theme="{{history.messageTheme}}" 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>
             <button class="btn2" size='mini' type='default' data-cnum="{{history.conference.conferenceNumber}}" onTap="destine">再次预定</button>
           </view>

pages/meeting/recording/recording.js

@@ -66,7 +66,7 @@ Page({
     console.log(e.currentTarget.dataset.messageName);
 
     dd.navigateTo({
-      url: '/pages/meeting/details/details?messageName=' + e.currentTarget.dataset.messageName + '&conferenceName=' + e.currentTarget.dataset.conferenceName + "&messageCompere=" + e.currentTarget.dataset.messageCompere + "&startTime=" + e.currentTarget.dataset.startTime + "&endTime=" + e.currentTarget.dataset.endTime +  "&department=" + e.currentTarget.dataset.department + "&messageContent=" + e.currentTarget.dataset.messageContent + "&configValueIdString=" + e.currentTarget.dataset.configValueIdString
+      url: '/pages/meeting/details/details?messageName=' + e.currentTarget.dataset.messageName + '&conferenceName=' + e.currentTarget.dataset.conferenceName + "&messageCompere=" + e.currentTarget.dataset.messageCompere+ "&messageTheme=" + e.currentTarget.dataset.messageTheme + "&startTime=" + e.currentTarget.dataset.startTime + "&endTime=" + e.currentTarget.dataset.endTime +  "&department=" + e.currentTarget.dataset.department + "&messageContent=" + e.currentTarget.dataset.messageContent + "&configValueIdString=" + e.currentTarget.dataset.configValueIdString
 
     })
   },

pages/mine/edit/edit.axml

@@ -6,7 +6,7 @@
 </view>
 <view class='item-avatar-xs'>
   <text>手 机 ：</text>
-  <input type='number' name="phonetel" value='{{user.phonetel}}'></input>
+  <input type='num' name="phonetel" value='{{user.phonetel}}' maxlength="11" onBlur="Phone" />
 </view>
 <view class='item-avatar-xs'>
   <text>昵 称 ： 
@@ -14,13 +14,13 @@
 </view>
 <view class='item-avatar-xs'>
   <text>邮 箱 ：</text>
-  <input value="{{user.email}}" name="email" placeholder='请输入常用邮箱' />
+  <input type="email" value="{{user.email}}" name="email" placeholder='请输入常用邮箱' onBlur="Email"  />
 </view>
 <view class='item-avatar-xs'>
   <text>性 别 ：</text>
-  <radio-group class="radio-group" name="sex">
+  <radio-group class="radio-group" name="sex" onChange="SexChange">
     <label class="radio" a:for="{{sexs}}" a:for-item="sex" >
-      {{sex.value}} <radio value="{{sex.name}}" checked="{{sex.checked}}" >
+      {{sex.value}} <radio value="{{sex.value}}" checked="{{sex.checked}}" >
     </label>
   </radio-group>
 

pages/mine/edit/edit.js

@@ -10,7 +10,8 @@ Page({
     sexs:[
       { name: 'man', value: '男' , checked:true},
       { name: 'women', value: '女' }
-    ]
+    ],
+    inputValue: ''
   },
   selectImg() {
     var _self = this
@@ -32,17 +33,48 @@ Page({
       }
     })
   },
+  Phone(e) {
+    var phone = e.detail.value;
+    if (!(/^1[34578]\d{9}$/.test(phone))) {
+    if (phone.length < 11) {
+      dd.alert({
+        content: '手机号码格式有误',
+        buttonText: '我知道了',
+      });
+    }
+    } 
+  },
+  Email(e) {
+    var email = e.detail.value;
+    let str = /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/
+      if (str.test(email)) {
+      return true
+      } 
+      else {
+      dd.alert({
+      content: '请填写正确的邮箱号',
+      buttonText: '我知道了',
+      })
+      }
+  },
+  // SexChange(e) {
+  //   console.log('你选择的是：', e.detail.value)
+   
+   
+  // },
   
   onLoad(query) {
     // 页面加载
-    // console.info(`Page onLoad with query: ${JSON.stringify(query)}`);
+     console.info(`Page onLoad with query: ${JSON.stringify(query)}`);
     var user = {};
     user['nickname']=query.nickname;
     user['phonetel']=query.phonetel;
     user['email'] = query.email;
     user['id'] = query.id;
     user['headPortait'] = query.headPortait;
-    var sexs=this.data.sexs;
+    user['sex'] = query.sex;
+    //var sexs=this.data.sexs;
+     var sexs = this.data.sexs;
      if (query.sex=='男'){
       sexs[0]["checked"]=true;
       sexs[1]["checked"] = false;
@@ -51,10 +83,11 @@ Page({
       sexs[0]["checked"] = false;
     }
     this.setData({
+        sexs:sexs,
         user
 
-
     });
+   
   },
   updateInfo:function(e){
     console.log("携带参数", e.detail.value);
@@ -65,11 +98,12 @@ Page({
         id:this.data.user.id,
         phonetel: e.detail.value.phonetel,
         nickname: e.detail.value.nickname,
-        email: e.detail.value.email
+        email: e.detail.value.email,
+        sex: e.detail.value.sex
       },
       dataType: 'json',
       success: function(res) {
-        //   console.log('success----', res)
+           console.log('success----', res)
 
 
         if (res.data.success) {
@@ -79,9 +113,12 @@ Page({
             content: '修改成功',
             buttonText: '确定',
             success: () => {
-              dd.reLaunch({
-                url: '../my/my'
-              });
+              dd.navigateBack({
+              delta: 1
+             })
+              // dd.({
+              //   url: '../my/my'
+              // });
             },
           });
         } else {

pages/mine/my/my.axml

@@ -12,7 +12,7 @@
         <text class="user_title">{{user.nickname}}</text>
       </view>
       <view class="flex">
-        <text class="user_title2">用户名：{{user.userAccount}}</text>
+        <text class="user_title2">用户账号：{{user.userAccount}}</text>
       </view>
     </view>
   </view>

pages/mine/my/my.js

@@ -84,7 +84,7 @@ Page({
       },
       dataType: 'json',
       success: function(res) {
-        console.log('success----', res)
+        console.log('我的信息--->>', res)
          
         _this.setData({
           user: res.data.result