Merge branch 'dev' into pre

src/components/callBack/index.vue

@@ -172,6 +172,7 @@
     getUserTagApi,
     getTagApi,
     getCallBackApi,
+    getCallBackPrevApi,
     postCallBackApi,
     postUserTagApi,
     delUserTagApi,
@@ -385,6 +386,17 @@
           // console.log(res, 999)
           this.user = res;
           this.getData();
+          if (this.callbackObj.teacher_id) {
+            let json = {
+              user_id: this.user.user_id
+            }
+            getCallBackPrevApi(json).then(res => {
+              if (res && res[0] && res[0].next_visit_at && res[0].intention) {
+                this.add.intention = res[0].intention;
+                this.add.next_visit_at = res[0].next_visit_at;
+              }
+            })
+          }
           this.loading = false;
         })
       },
@@ -398,9 +410,8 @@
           limit: this.limit,
           page: this.nowPage
         };
-        this.teacher_num ? json.teacher_num = this.teacher_num : '';
-        this.user.user_id ? json.user_id = this.user.user_id : '';
-        // console.log(json, 9000)
+        // this.teacher_num ? json.teacher_num = this.teacher_num : ''; 老师微信号
+        this.callbackObj.user_id ? json.user_id = this.callbackObj.user_id : '';
         getCallBackApi(json).then(res => {
           this.list = res.page_data;
           this.total = res.total

src/components/system/staff.vue

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

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

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