Merge remote-tracking branch 'origin/development' into development

src/components/smsRecord/index.vue

@@ -11,7 +11,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="手机号">
+          <el-form-item label="短信手机号">
             <el-input v-model="searchFrom.mobile"  @change="getList"></el-input>
           </el-form-item>
           <el-form-item label="发送结果">
@@ -31,17 +31,26 @@
     <el-table
       :data="list"
       style="width: 100%">
+      <el-table-column
+        className="f-c"
+        label="用户">
+        <template slot-scope="scope">
+          <div v-if="scope.row.user_id">
+              <img class="avatar" :src="scope.row.avatar"> {{scope.row.nickname}}(ID:{{scope.row.user_id}}) <br>手机：{{scope.row.user_mobile}}
+          </div>
+           <div v-if="!scope.row.user_id">
+              未绑定用户信息
+          </div>
+        </template>
+      </el-table-column>
+
       <el-table-column
         prop="mobile"
-        label="手机号">
+        label="短信手机号">
       </el-table-column>
        <el-table-column
         prop="sms_code"
         label="短信验证码">
-      </el-table-column>
-       <el-table-column
-        prop="nickname"
-        label="发送人">
       </el-table-column>
       <el-table-column
         label="发送结果">
@@ -148,21 +157,23 @@
 
 </script>
 
-<style scoped>
+<style scoped lang="less">
   .sms{
     padding: 20px 0;
   }
   .avatar {
     width:50px;
+    min-width: 50px;
     height: 50px;
     border-radius: 50%;
   }
 </style>
 <style>
-  .userInfo >div{
-    display: flex;
-    flex-flow: row nowrap;
+    .f-c >.cell div{
+    display: flex !important;
+    flex-flow: row;
     justify-content: flex-start;
     align-items: center;
   }
 </style>
+