Merge branch 'dev' of http://git.singsingenglish.com/new-sing/admin into dev

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/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/user/index.vue

 <template>
   <div class="admin-refresh" v-loading="loading">
+
+    <!--为了共享user权限-->
+    <user-detail v-if="inDetail"></user-detail>
+
+    <div v-else>
       <div class="section-search">
         <el-form ref="searchFrom" :model="searchFrom" label-width="80px" inline>
           <el-form-item>
@@ -27,7 +32,6 @@
           </el-form-item>
         </el-form>
       </div>
-
       <el-table
         :data="userList"
         style="width: 100%">
@@ -46,7 +50,7 @@
         <el-table-column label="操作" width="200px">
           <template slot-scope="scope">
             <!--<el-button size="mini" plain type="primary" @click="goToDetail(scope.row.user_id)">查看详情</el-button>-->
-          <router-link :to="{path:'/userDetail', query:{userid: scope.row.user_id}}" target="_blank"><el-button size="mini" plain type="primary">查看详情</el-button></router-link>
+            <router-link :to="{path:'/user', query:{type: 'detail', userid: scope.row.user_id}}" target="_blank"><el-button size="mini" plain type="primary">查看详情</el-button></router-link>
             <el-button size="mini" v-if="!$store.state.readonly" plain type="warning" @click="userTransfer(scope.row)">用户转移</el-button>
           </template>
         </el-table-column>
@@ -91,6 +95,8 @@
       </span>
       </el-dialog>
     </div>
+
+  </div>
 </template>
 
 <script>
@@ -104,6 +110,7 @@
     name: "index",
     data() {
       return {
+        inDetail: false,
         addShow: false,
         userTransferList: [],
         userObj: {
@@ -161,8 +168,13 @@
       teacherDialog
     },
     mounted() {
-      this.$route.query.id ? this.searchFrom.userId = this.$route.query.id : '';
+      if (this.$route.query.type && this.$route.query.type == 'detail') { // 详情页
+        this.inDetail = true
+      } else { // 列表页
+        this.inDetail = false;
         this.getUser();
+      }
+      this.$route.query.id ? this.searchFrom.userId = this.$route.query.id : '';
     },
     methods: {
       userTransfer(row) {

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)