Merge remote-tracking branch 'origin/master'

public/css/common.scss

@@ -22,6 +22,16 @@ body, div, ul, li, h1, h2, h3, h4, h5, h6, p, dl, dt, dd, ol, form, input, texta
   opacity: 0.69;
 }
 
+
+//弹性盒子
+.gendisplay{
+  display: -webkit-flex; /*新版本语法：chrome 21+*/
+  display: -webkit-box; /*老版本语法：Safari,iOS,Android browser,old Webkit browser*/
+  display: -moz-box; /*老版本语法：Firefox(buggy)*/
+  display: -ms-flexbox; /*混合版本语法：IE 10*/
+  display: flex; /*新版本语法:opera 12.1,Firefox 22+*/
+}
+
 /****input****/
 input.el-input__inner {
   border: 1px solid #C8CBE0;

src/views/conmanagementpage/contentall.vue

@@ -18,7 +18,7 @@
             <img src="../../assets/img/Bitmap1.jpg" alt="图片" style="width: 100%;height: 200px;">
         </div>
         <div class="divclasschild">
-            <div style="display: flex;">
+            <div>
                 <div style="width: 100%;margin-right: 30px;">
                     <div :style="positions?'position: fixed;top: 0;background: #ffffff;z-index: 99;width: 56%;':'position: relative;width: 100%;'">
                         <el-tabs class="content_tab" v-if="issearchclas" v-model="activeName" @tab-click="handleClick">
@@ -367,6 +367,13 @@
     }
     .divclasschild{
         margin: 25px 120px 0;
+        >div{
+            display: -webkit-flex;/*新版本语法：chrome 21+*/
+            display: -webkit-box;/*老版本语法：Safari,iOS,Android browser,old Webkit browser*/
+            display: -moz-box;/*老版本语法：Firefox(buggy)*/
+            display: -ms-flexbox;/*混合版本语法：IE 10*/
+            display: flex;/*新版本语法:opera 12.1,Firefox 22+*/
+        }
     }
     .contentlist_ul{
         /*>li:nth-child(1){*/
@@ -376,7 +383,11 @@
         /*}*/
     }
     .state_code{
-        display: flex;
+        display: -webkit-flex;/*新版本语法：chrome 21+*/
+        display: -webkit-box;/*老版本语法：Safari,iOS,Android browser,old Webkit browser*/
+        display: -moz-box;/*老版本语法：Firefox(buggy)*/
+        display: -ms-flexbox;/*混合版本语法：IE 10*/
+        display: flex;/*新版本语法:opera 12.1,Firefox 22+*/
         >p{
             position: absolute;
             bottom: 0px;
@@ -393,7 +404,11 @@
         }
     }
     .isstate_code{
-        display: flex;
+        display: -webkit-flex;/*新版本语法：chrome 21+*/
+        display: -webkit-box;/*老版本语法：Safari,iOS,Android browser,old Webkit browser*/
+        display: -moz-box;/*老版本语法：Firefox(buggy)*/
+        display: -ms-flexbox;/*混合版本语法：IE 10*/
+        display: flex;/*新版本语法:opera 12.1,Firefox 22+*/
         >p{
             color: #AAAAAA;
             >span{
@@ -412,7 +427,11 @@
         border-bottom: 1px solid #E9EAF3;
         >div{
             width: 100%;
-            display: flex;
+            display: -webkit-flex;/*新版本语法：chrome 21+*/
+            display: -webkit-box;/*老版本语法：Safari,iOS,Android browser,old Webkit browser*/
+            display: -moz-box;/*老版本语法：Firefox(buggy)*/
+            display: -ms-flexbox;/*混合版本语法：IE 10*/
+            display: flex;/*新版本语法:opera 12.1,Firefox 22+*/
             padding: 25px 0;
             position: relative;
             >div:nth-child(1){

src/views/conmanagementpage/contentdetail.vue

@@ -49,7 +49,7 @@
                         </span>
                     </p>
                     <div id="htmldetail" v-html="contentData.contentDetail" style="line-height: 30px;font-size: 16px;color: #1A1A1E;"></div>
-                    <div style="display: flex;padding: 30px 0;">
+                    <div class="gendisplay" style="padding: 30px 0;">
                         <div style="width: 100%;color:#aaa;font-size: 14px;">
                             <p v-if="contentData.contentSource">来源： {{contentData.contentSource}}</p>
                             <p v-if="contentData.originalUrl">来源地址： {{contentData.originalUrl}}</p>
@@ -582,7 +582,11 @@
     }
     .content_right{
         >div{
-            display: flex;
+            display: -webkit-flex;/*新版本语法：chrome 21+*/
+            display: -webkit-box;/*老版本语法：Safari,iOS,Android browser,old Webkit browser*/
+            display: -moz-box;/*老版本语法：Firefox(buggy)*/
+            display: -ms-flexbox;/*混合版本语法：IE 10*/
+            display: flex;/*新版本语法:opera 12.1,Firefox 22+*/
             margin: 20px 0;
             >div{
                 >img{
@@ -620,7 +624,11 @@
     }
     .operation{
         width: 100%;
-        display: flex;
+        display: -webkit-flex;/*新版本语法：chrome 21+*/
+        display: -webkit-box;/*老版本语法：Safari,iOS,Android browser,old Webkit browser*/
+        display: -moz-box;/*老版本语法：Firefox(buggy)*/
+        display: -ms-flexbox;/*混合版本语法：IE 10*/
+        display: flex;/*新版本语法:opera 12.1,Firefox 22+*/
         color:#9197B4;
         >p:nth-child(1){
             width: 50%;

src/views/publishactivity/proactivity.vue

@@ -123,7 +123,7 @@
                                 <el-form-item :label="$t('pubactivities.inviteguests')+'：'" style="width: 100%;">
                                     <el-button type="primary" plain @click="addguest">{{$t('pubactivities.addguests')}}</el-button>
                                 </el-form-item>
-                                <div style="display: flex;flex-wrap: wrap;width: 80%;margin-left: 210px">
+                                <div class="gendisplay" style="display: flex;flex-wrap: wrap;width: 80%;margin-left: 210px">
                                     <div v-for="(item,index) in guestlist" style="width: 150px;text-align: center;position: relative">
                                         <p><img :src="item.guestPic" style="width: 90px;height: 90px;border-radius: 50%"></p>
                                         <p style="margin: 10px 0">{{item.guestName}}</p>
@@ -915,6 +915,10 @@
                         }
                         this.provinceIf = true;
                         this.formData = response.result;
+                        this.getcalcTimeOfBeijing(this.publicFun.gettimeZone(this.formData.channelStartTime,this.formData.timeZone),1,false);
+                        this.getcalcTimeOfBeijing(this.publicFun.gettimeZone(this.formData.channelEndTime,this.formData.timeZone),2,false);
+                        this.getcalcTimeOfBeijing(this.publicFun.gettimeZone(this.formData.activityStartTime,this.formData.timeZone),3,false);
+                        this.getcalcTimeOfBeijing(this.publicFun.gettimeZone(this.formData.activityEndTime,this.formData.timeZone),4,false);
                         if(!response.result.channelProvince){
                             this.formData.channelProvince = '';
                         }

src/views/seeprojects/seeprojectlist.vue

@@ -102,7 +102,7 @@
             </el-row>
         </el-dialog>
         <el-dialog :title="$t('interseted.title')" :close-on-press-escape="false" :visible.sync="Visible5" :append-to-body="true" :close-on-click-modal="false" class="dialogWrap500 dialogWrap640">
-            <div style="margin: 20px auto;display: flex;width: 80%;flex-wrap:wrap;">
+            <div class="gendisplay" style="margin: 20px auto;display: flex;width: 80%;flex-wrap:wrap;">
                 <div class="contactscss" style="display: flex" :class="item.state?'':'iscontactscss'" v-for="(item,index) in fielddata">
                     <div @click="contactsclk(item)">
                         <div class="images" :class="item.state?'':'isimages'">