diff --git a/src/views/ss/customerService/index.vue b/src/views/ss/customerService/index.vue
index 65ea391..c2c7252 100644
--- a/src/views/ss/customerService/index.vue
+++ b/src/views/ss/customerService/index.vue
@@ -17,14 +17,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="微信号" prop="wx">
-        <el-input
-          v-model="queryParams.wx"
-          placeholder="请输入微信号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -87,6 +79,12 @@
             <template v-else-if="column.key === 'type'">
               <dict-tag :value="d.row.type" :options="dict.type.customer_service_type"/>
             </template>
+            <template v-else-if="column.key === 'wx'">
+              <image-preview :src="d.row.wx" :width="50" :height="50"/>
+            </template>
+            <template v-else-if="column.key === 'workTime'">
+              {{d.row.workTimeStart | defaultValue}} - {{d.row.workTimeEnd | defaultValue}}
+            </template>
             <template v-else>
               {{d.row[column.key]}}
             </template>
@@ -137,12 +135,24 @@
             />
           </el-select>
         </el-form-item>
+        <el-form-item label="上班时间" >
+          <el-time-picker
+            v-model="workTime"
+            is-range
+            value-format="HH:mm:ss"
+            placeholder="请选择上班时间"
+            style="width: 100%"
+            range-separator="至"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+          />
+        </el-form-item>
+        <el-form-item label="微信" prop="wx">
+          <image-upload v-model="form.wx" :limit="1" />
+        </el-form-item>
         <el-form-item label="手机号" prop="mobile">
           <el-input v-model="form.mobile" placeholder="请输入手机号" />
         </el-form-item>
-        <el-form-item label="微信号" prop="wx">
-          <el-input v-model="form.wx" placeholder="请输入微信号" />
-        </el-form-item>
         <el-form-item label="排序" prop="sort">
           <el-input-number v-model="form.sort" placeholder="请输入排序" style="width: 100%"/>
         </el-form-item>
@@ -175,9 +185,10 @@ export default {
       columns: [
         {key: 'id', visible: true, label: 'ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: "80"},
         {key: 'name', visible: true, label: '名称', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'mobile', visible: true, label: '手机号', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'type', visible: true, label: '类型', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'wx', visible: true, label: '微信号', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'workTime', visible: true, label: '上班时间', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'wx', visible: true, label: '微信', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'mobile', visible: true, label: '手机号', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'sort', visible: true, label: '排序', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'createTime', visible: true, label: '创建时间', minWidth: null, sortable: true, overflow: false, align: 'center', width: "180"},
       ],
@@ -227,6 +238,20 @@ export default {
       }
     };
   },
+  computed: {
+    workTime: {
+      get() {
+        if (this.form.workTimeStart && this.form.workTimeEnd) {
+          return [this.form.workTimeStart, this.form.workTimeEnd];
+        }
+        return [];
+      },
+      set(value) {
+        this.form.workTimeStart = value[0];
+        this.form.workTimeEnd = value[1];
+      }
+    }
+  },
   created() {
     this.getList();
   },
@@ -264,6 +289,8 @@ export default {
         mobile: null,
         type: "1",
         wx: null,
+        workTimeStart: "08:00:00",
+        workTimeEnd: "18:00:00",
         sort: 0
       };
       this.resetForm("form");