Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

src/components/sallCenter/addAutoreleaseCoupon.vue

@@ -49,7 +49,7 @@
           <div style="flex-wrap: wrap;" flex="dir:left">
             <div  flex="dir:top cross:center" class="user-item" v-for="(item,index) in UserList" :label="item.Id" :key="index">
               <img :src="item.Photo" alt="" class="avatar">
-              <div class="username">{{item.AliasName}}</div>
+              <div class="username">{{item.Name}}</div>
               <button type="button" class="el-button close el-button--danger is-circle" @click="delUserList(index)"><i class="el-icon-close"></i></button>
             </div>
           </div>
@@ -62,7 +62,7 @@
     <!--选择用户-->
     <el-dialog title="选择用户" :visible.sync="category" width="612px">
       <div class="el-input el-input--small el-input-group el-input-group--append">
-        <input type="text" autocomplete="off" placeholder="输入用户ID、昵称搜索" class="el-input__inner" v-model="msg_t.AliasName">
+        <input type="text" autocomplete="off" placeholder="输入用户ID、昵称搜索" class="el-input__inner" v-model="msg_t.Name">
         <div class="el-input-group__append"><button type="button" class="el-button el-button--default" @click="search"><!----><!----><span>搜索</span></button></div>
       </div>
       <el-table
@@ -91,7 +91,7 @@
           </template>
         </el-table-column>
         <el-table-column
-          prop="AliasName"
+          prop="Name"
           label="昵称"
           show-overflow-tooltip>
         </el-table-column>
@@ -140,7 +140,7 @@
             msg_t:{
               pageIndex:1,
               pageSize:10,
-              AliasName:''
+              Name:''
             },
             count:0,
             loading:false,