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

src/components/userDetail/index.vue

@@ -359,6 +359,54 @@
           </el-table-column> -->
         </el-table>
       </el-tab-pane>
+      <el-tab-pane label="成长记录" name="growthRecord">
+        <el-table :data="growthRecordList">
+          <el-table-column
+            prop="element_title"
+            width="200"
+            label="歌曲名">
+          </el-table-column>
+          <el-table-column
+            prop="category_name"
+            width="200"
+            label="课程">
+          </el-table-column>
+          <el-table-column
+            prop="interest"
+            width="100"
+            label="兴趣度">
+          </el-table-column>
+          <el-table-column
+            prop="concent"
+            width="100"
+            label="专注度">
+          </el-table-column>
+          <el-table-column
+            prop="parent_child"
+            width="100"
+            label="亲子互动">
+          </el-table-column>
+          <el-table-column
+            prop="growth_record"
+            label="成长记录">
+            <template slot-scope="scope">
+              <el-popover
+                placement="top-start"
+                width="200"
+                trigger="hover"
+                :content="scope.row.growth_record">
+                <el-button slot="reference">{{scope.row.growth_record}}</el-button>
+              </el-popover>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="created_at"
+            width="200"
+            label="提交时间">
+          </el-table-column>
+        </el-table>
+        <page :total="total" :limit="limit" @pageChange="onRecordPageChange" @sizeChange="onRecordSizeChange"/>
+      </el-tab-pane>
     </el-tabs>
     <teacher-dialog :dialogObj="dialogObj" @reflash="getDetail"></teacher-dialog>
     <user-list :userObj="userObj"/>
@@ -515,7 +563,8 @@
     getyunjiApi,
     fetchAddressListApi,
     getSubAccountInfoApi,
-    getUserSubAccountListApi
+    getUserSubAccountListApi,
+    getGrowthRecordApi
   } from "../../service/api";
   import page from '../framework/page'
   import sourceDialog from '../order/sourceDialog'
@@ -644,7 +693,8 @@
           }
         ],
         sourceByDateDialogJson: {},
-        deliverRecordList: []
+        deliverRecordList: [],
+        growthRecordList:[]
       }
     },
     created() {
@@ -675,6 +725,10 @@
         if (value === 'deliverRecord') {
           this.getDeliverRecordList()
         }
+        if (value === 'growthRecord') {
+          this.getGrowthRecordList()
+        }
+
 
       }
     },
@@ -713,6 +767,13 @@
           console.log(this.deliverRecordList)
         })
       },
+      getGrowthRecordList() {
+        getGrowthRecordApi({user_id: this.id, page: this.recordPage, limit: this.limit}).then(res => {
+          this.growthRecordList = res.list
+          this.total = res.total
+          console.log(this.growthRecordList)
+        })
+      },
       onUpdateAddress() {
         this.dialogObj.show = false;
         this.getAddressList();
@@ -857,6 +918,15 @@
         this.limit = val;
         this.getUser();
       },
+      onRecordPageChange(val) {
+        this.recordPage = val;
+        this.getGrowthRecordList();
+      },
+      onRecordSizeChange(val) {
+        this.recordPage = 1;
+        this.limit = val;
+        this.getGrowthRecordList();
+      },
       getUser() {
         let json = {
           user_id: this.id,

src/service/api.js

@@ -1497,3 +1497,9 @@ export const getHourSingleApi = function (json) {
 export const getHourTimeApi = function (json) {
   return Vue.prototype.$fetch(`${_baseUrl}api/admin/teacher/timeslotrecordlist`, json)
 };
+
+// 成长记录
+export const getGrowthRecordApi = function (json) {
+  return Vue.prototype.$fetch(`${_baseUrl}api/admin/user/growth/list`,json)
+};
+

src/util/menuList.js

@@ -233,6 +233,17 @@ export default [
     value: '用户管理',
     icon: 'icon-yonghu',
     list: [
+      {
+        value: '成长记录',
+        routerName: 'growthRecord',
+        path: '/growthRecord',
+        cover: '3-8',
+        router: {
+          path: '/growthRecord',
+          name: 'growthRecord',
+          component: e => require(['@/components/growthRecord'], e),
+        }
+      },
       {
         value: '用户列表',
         routerName: 'user',