用户详情 新增用户详情的页面

src/components/callBack/index.vue

@@ -3,7 +3,7 @@
   <div class="callback-container">
 
     <div class="callback-item" style="margin-bottom: 15px;">
-      ID：{{callbackObj.detail.user_id}} &emsp;
+      ID：{{callbackObj.user_id}} &emsp;
       用户昵称：{{callbackObj.detail.nickname}} &emsp;
       宝宝名称：{{callbackObj.detail.baby_name ? callbackObj.detail.baby_name : '-'}} &emsp;
       宝宝生日：{{(callbackObj.detail.birthday == '0000-00-00') ? '-' : callbackObj.detail.birthday}} &emsp;
@@ -59,7 +59,7 @@
           <template v-if="item.flag == 0">
             <span class="time">{{item.created_at}}</span>
             <span class="grey">系统导入</span>
-            <span class="grey" v-if="item.first_key && item.desc" :class="(item.desc.indexOf('支付')>-1) ? 'bold' : ''">{{item.first_key}}</span>
+            <span class="grey" v-if="item.first_key" :class="(item.desc && item.desc.indexOf('支付')>-1) ? 'bold' : ''">{{item.first_key}}</span>
             <span class="info" v-if="item.desc" :class="(item.desc.indexOf('支付')>-1) ? 'red' : ''">{{item.desc}}</span>
           </template>
           <template v-else-if="item.flag == 1">
@@ -228,7 +228,7 @@
           return
         }
         var json = {
-          user_id: this.callbackObj.id,
+          user_id: this.callbackObj.user_id,
           type: 0,
           first_label_id: this.tagSelected[0]
         };
@@ -275,8 +275,8 @@
         });
       },
       getTag() {
-        if (this.callbackObj.id) {
-          getUserTagApi(this.callbackObj.id).then(res => {
+        if (this.callbackObj.user_id) {
+          getUserTagApi(this.callbackObj.user_id).then(res => {
             this.tag = res;
           })
         }
@@ -287,7 +287,7 @@
           page: this.nowPage
         };
         this.teacher_num ? json.teacher_num = this.teacher_num : '';
-        this.callbackObj.id ? json.user_id = this.callbackObj.id : '';
+        this.callbackObj.user_id ? json.user_id = this.callbackObj.user_id : '';
         console.log(json, 9000)
         getCallBackApi(json).then(res => {
           this.list = res.page_data;
@@ -316,7 +316,7 @@
           return
         }
         let json = {
-          user_id: this.callbackObj.id,
+          user_id: this.callbackObj.user_id,
           teacher_id: this.callbackObj.teacher_id, // TODO
           // teacher_id: 84, // TODO
           method: this.add.method,

src/components/framework/leftMenu.vue

@@ -7,8 +7,7 @@
     background-color="#333333"
     active-text-color="#ffd04b"
     :collapse="menuType"
-    class="el-menu-vertical-demo"
-  >
+    class="el-menu-vertical-demo">
     <div class="menu-btn" @click="menuType = !menuType">
       <i v-if="!menuType" class="iconfont icon-shouqi"></i>
       <i v-if="menuType" class="iconfont icon-zhankai"></i>
@@ -18,12 +17,11 @@
         <i :class="'iconfont menu-icon '+data.icon"></i>
         <span>{{data.value}}</span>
       </template>
+      <template v-for="(item,i) in data.list">
         <el-menu-item
-        v-for="(item,i) in data.list"
-        :index="item.path"
-        :key="i"
-        class="item"
-      >{{item.value}}</el-menu-item>
+          v-if="!item.hidden" class="item"
+          :index="item.path" :key="i">{{item.value}}</el-menu-item>
+      </template>
     </el-submenu>
   </el-menu>
 </template>

src/components/framework/teacherDesc.vue

 <template>
-  <div>
   <div>
       <el-button size="mini" type="text" @click="editDesc(row)">
-      <span v-if="row.desc !== ''">
-        {{ row.desc }}
-      </span>
+      <!--<el-button size="mini" type="text">-->
+        <span v-if="row.desc !== ''">{{ row.desc }}</span>
         <span style='color:red' v-if="row.desc === '' && !typeFlag">今日未沟通</span>
         <span style='color:red' v-if="row.desc === '' && typeFlag">暂未沟通</span>
       </el-button>
-    </div>
-    <el-button size="mini" @click="editComment(row.id)">
+    <!--<router-link :to="{path:'/userDetail', query:{userid: row.user_id, teacherid: teacherId}}" target="_blank">
+    </router-link>-->
+
+    <!--<el-button size="mini" @click="editComment(row.id)">
       新增话术记录
-    </el-button>
+    </el-button>-->
 
     <el-dialog append-to-body :visible.sync="descDialog.show" title="沟通情况列表" width="75%">
 
@@ -141,7 +141,7 @@
           user_id:data.user_id,
         };
         // this.getUserDescList();
-        this.callbackObj.id = data.user_id;
+        this.callbackObj.user_id = data.user_id;
         this.callbackObj.teacher_id = this.teacherId;
         this.callbackObj.detail.birthday = data.birthday;
         this.callbackObj.detail.user_id = data.user_id;

src/components/user/index.vue

@@ -45,7 +45,8 @@
       <el-table-column prop="sex" label="宝宝性别" width="80px" :formatter="sexFormatter"></el-table-column>
       <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>
+          <!--<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>
           <el-button size="mini" v-if="!$store.state.readonly" plain type="warning" @click="userTransfer(scope.row)">用户转移</el-button>
         </template>
       </el-table-column>

src/components/userDetail/detail.vue

 <template>
-  <div>
+  <div class="user-detail">
 
     <el-row :gutter="20" style="margin-bottom: 20px;">
       <el-col :span="12">
@@ -58,7 +58,7 @@
     <!--<el-tabs type="border-card" v-model="tabs">-->
     <el-tabs type="border-card" v-model="tabs">
       <el-tab-pane label="回访信息" name="callback">
-        <call-back :callbackObj="callbackObj"></call-back>
+        <call-back :callbackObj="callbackObj" :callbackAdd="true"></call-back>
       </el-tab-pane>
       <el-tab-pane label="期数列表" name="periods">
         <el-table @expand-change="changeRow" :data="periodList">
@@ -646,8 +646,9 @@
       }
     },
     created() {
-      this.id = this.parentDetail ? this.parentDetail.id : this.$route.params.id;
+      this.id = this.parentDetail ? this.parentDetail.id : (this.$route.query.userid ? this.$route.query.userid : '');
       this.callbackObj.user_id = this.id;
+      this.callbackObj.teacher_id = this.parentDetail && this.parentDetail.teacher_id ? this.parentDetail.teacher_id : (this.$route.query.teacherid ? this.$route.query.teacherid : '');
     },
     mounted() {
       this.getDetail();
@@ -1022,6 +1023,11 @@
     },
     filters: {
       payMentFilter(val) {
+        arr.forEach(function(value, index, array) {
+          value.forEach(function (value2, index2, array2) {
+
+          })
+        })
         return val == '1' ? '已付款' : '未付款'
       },
       courseTypeFilter(val) {
@@ -1150,10 +1156,8 @@
 </style>
 
 <style>
-  .f-c > div {
-    display: flex !important;
-    flex-flow: row;
-    justify-content: flex-start;
-    align-items: center;
+  .user-detail {
+    padding: 20px;
   }
 </style>
+

src/components/userDetail/index.vue

 <template>
   <div>
-
     <el-row :gutter="20" style="margin-bottom: 20px;">
       <el-col :span="12">
         <el-card class="user-card">
@@ -58,7 +57,7 @@
     <!--<el-tabs type="border-card" v-model="tabs">-->
     <el-tabs type="border-card" v-model="tabs">
       <el-tab-pane label="回访信息" name="callback">
-        <call-back :callbackObj="callbackObj"></call-back>
+        <call-back :callbackObj="callbackObj" :callbackAdd="true"></call-back>
       </el-tab-pane>
       <el-tab-pane label="期数列表" name="periods">
         <el-table @expand-change="changeRow" :data="periodList">
@@ -531,6 +530,20 @@
 
   export default {
     name: "index",
+    components: {
+      page,
+      teacherDialog,
+      UserList,
+      refundDetail,
+      sourceDialog,
+      couponDialog,
+      sourceByDateDialog,
+      addressDialogC,
+      CallBack
+    },
+    props: [
+      'parentDetail'
+    ],
     data() {
       return {
         callbackObj: {
@@ -631,23 +644,10 @@
         deliverRecordList: []
       }
     },
-    components: {
-      page,
-      teacherDialog,
-      UserList,
-      refundDetail,
-      sourceDialog,
-      couponDialog,
-      sourceByDateDialog,
-      addressDialogC,
-      CallBack
-    },
-    props: [
-      'parentDetail'
-    ],
     created() {
       this.id = this.parentDetail ? this.parentDetail.id : this.$route.params.id;
-      this.callbackObj.id = this.id;
+      this.callbackObj.user_id = this.id;
+      this.callbackObj.teacher_id = this.parentDetail.teacher_id ? this.parentDetail.teacher_id : '';
     },
     mounted() {
       this.getDetail();
@@ -725,27 +725,21 @@
             return item.label === row.province_name;
           });
           if (provinceObj && provinceObj.length > 0) {
-            this.addressDialog.province = row.province_id
-              ? row.province_id
-              : provinceObj[0].value;
+            this.addressDialog.province = row.province_id ? row.province_id : provinceObj[0].value;
             if (!row.city) {
               this.addressDialog.city = "";
             } else {
               let cityObj = provinceObj[0].children.filter(city => {
                 return city.label === row.city;
               });
-              this.addressDialog.city = row.city_id
-                ? row.city_id
-                : cityObj[0].value;
+              this.addressDialog.city = row.city_id ? row.city_id : cityObj[0].value;
               if (!row.area) {
                 this.addressDialog.district = "";
               } else {
                 let districtObj = cityObj[0].children.filter(district => {
                   return district.label === row.area;
                 });
-                this.addressDialog.district = row.area_id
-                  ? row.area_id
-                  : districtObj[0].value;
+                this.addressDialog.district = row.area_id ? row.area_id : districtObj[0].value;
               }
             }
           } else {
@@ -755,19 +749,11 @@
           }
         }
         this.addressDialog.detail = row ? row.address : "";
-        this.addressDialog.receive_mobile = row
-          ? row.receive_mobile
-          : "";
-        this.addressDialog.receive_name = row
-          ? row.receive_name
-          : "";
-        this.addressDialog.province_name = row
-          ? row.province_name
-          : "";
+        this.addressDialog.receive_mobile = row ? row.receive_mobile : "";
+        this.addressDialog.receive_name = row ? row.receive_name : "";
+        this.addressDialog.province_name = row ? row.province_name : "";
         this.addressDialog.city_name = row ? row.city : "";
-        this.addressDialog.district_name = row
-          ? row.area
-          : "";
+        this.addressDialog.district_name = row ? row.area : "";
 
         this.addressDialog.is_del = row.is_del;
         this.addressDialog.id = row.id;

src/util/menuList.js

@@ -180,6 +180,18 @@ export default [{
         component: e => require(['@/components/user'], e),
       }
     },
+    {
+      value: '用户详情',
+      routerName: 'userDetail',
+      path: '/userDetail',
+      cover: '3-2',
+      hidden: true,
+      router: {
+        path: '/userDetail',
+        name: 'userDetail',
+        component: e => require(['@/components/userDetail/detail'], e),
+      }
+    },
     {
       value: '老系统用户列表',
       routerName: 'oldUser',