Merge branch 'dev' into pre

src/components/brokerage/index.vue

@@ -37,7 +37,9 @@
                 <template slot-scope="scope">
                   <el-input
                     type="number"
-                    v-model.number="scope.row.scale"></el-input>
+                    v-model.number="scope.row.scale">
+                    <template slot="append">%</template>
+                  </el-input>
                 </template>
               </el-table-column>
 

src/components/system/staff.vue

@@ -326,6 +326,7 @@
 
       onSearch(){
         this.getData();
+        this.$route.params.model = ''
       },
 
       onPageChange(val) {

src/components/system/tag.vue

@@ -19,15 +19,17 @@
 
     <div class="tag-tree">
       <el-tree
+        :indent="40"
         :data="treeData"
         node-key="id" ref="tagTree"
         :props="{children: 'children', label: 'name'}"
-        :indent="40"
         @node-expand="tagExpand"
         @node-collapse="tagCollapse"
         :filter-node-method="filterNode"
         :default-expanded-keys="tagExpanded"
         :expand-on-click-node="true">
+        <!--:check-on-click-node="true"
+        :check-strictly="true"-->
         <div class="custom-tree-node" slot-scope="{ node, data }">
           <el-tag class="tag-tree-item" effect="plain" size="medium">{{node.label}}</el-tag>
           <div style="display: flex">

src/components/teacherDetail/customer.vue

@@ -113,7 +113,7 @@
             <td>{{ item.friend_nickname }}</td>
             <td>{{ item.mobile }}</td>
             <td>{{ item.allow_time }}</td>
-            <td>{{ item.add_time_long }}</td>
+            <td>{{ item.add_time_long }}min</td>
           </template>
         </tr>
         </tbody>

src/service/api.js

@@ -71,6 +71,10 @@ export const getCallBackApi = function (json) {
   // console.log(json, 9001)
   return Vue.prototype.$fetch(`${_baseUrl}api/admin/user/visit/${json.user_id}`, json)
 };
+// 获取上次回访信息
+export const getCallBackPrevApi = function (json) {
+  return Vue.prototype.$fetch(`${_baseUrl}user/last/visit/${json.user_id}`, json)
+};
 // 添加回访信息
 export const postCallBackApi = function (json) {
   return Vue.prototype.$post(`${_baseUrl}api/admin/user/visit/${json.user_id}/${json.teacher_id}`, json)