Merge branch 'dev' into pre

src/components/brokerage/index.vue

@@ -23,12 +23,16 @@
                     <el-input
                       style="width: 46%;"
                       type="number"
-                      v-model.number="scope.row.min_money"></el-input>
+                      v-model.number="scope.row.min_money">
+                      <template v-if="item2.isMoneyPercent" slot="append">%</template>
+                    </el-input>
                     <div style="display: flex; align-items: center; justify-content: center; width: 8%;">~</div>
                     <el-input
                       style="width: 46%;"
                       type="number"
-                      v-model.number="scope.row.max_money"></el-input>
+                      v-model.number="scope.row.max_money">
+                      <template v-if="item2.isMoneyPercent" slot="append">%</template>
+                    </el-input>
                   </div>
                 </template>
               </el-table-column>
@@ -86,18 +90,21 @@
           value: '1',
           children: [{
             label: '试听课来源-转年课业绩提点配置',
+            isMoneyPercent: false,
             money: '业绩区间',
             scale: '提点比例',
             value: '1',
             data: []
           }, {
             label: '月课、季课来源-转年课业绩提点配置',
+            isMoneyPercent: false,
             money: '业绩区间',
             scale: '提点比例',
             value: '2',
             data: []
           }, {
             label: '年课来源 - 转两年课业绩提点配置',
+            isMoneyPercent: false,
             money: '业绩区间',
             scale: '提点比例',
             value: '3',
@@ -108,18 +115,21 @@
           value: '2',
           children: [{
             label: '主管业绩提点',
+            isMoneyPercent: true, // 是否显示%
             money: '业绩完成率',
             scale: '提点比例',
             value: '4',
             data: []
           }, {
             label: '主管转化率系数（试听课）',
+            isMoneyPercent: true,
             money: '团队转化率',
             scale: '转化系数',
             value: '5',
             data: []
           }, {
             label: '主管转化率系数（月课、季课）',
+            isMoneyPercent: true,
             money: '团队转化率',
             scale: '转化系数',
             value: '6',

src/components/callBack/index.vue

@@ -186,8 +186,7 @@
     props: {
       callbackObj: {
         type: Object,
-        default: () => {
-        }
+        default: () => {}
       },
       callbackAdd: {
         type: Boolean,
@@ -268,6 +267,11 @@
         this.callbackEdit.mobile.origin = this.user.relation_mobile;
         this.callbackEdit.wechat.value = this.user.wx_number;
         this.callbackEdit.wechat.origin = this.user.wx_number;
+      },
+      'callbackObj.timestamp'() {
+        this.user.user_id = this.callbackObj.user_id;
+        this.getUser();
+        this.getTag();
       }
     },
     mounted() {
@@ -388,7 +392,7 @@
           this.getData();
           if (this.callbackObj.teacher_id) {
             let json = {
-              user_id: this.user.user_id
+              user_id: this.callbackObj.user_id
             }
             getCallBackPrevApi(json).then(res => {
               if (res && res[0] && res[0].next_visit_at && res[0].intention) {

src/components/framework/teacherDesc.vue

@@ -98,8 +98,9 @@
     data(){
       return {
         callbackObj: {
-          id: '',
-          detail: {}
+          user_id: '',
+          teacher_id: '',
+          timestamp: ''
         },
         descDialog:{
           show:false,
@@ -144,11 +145,7 @@
         // this.getUserDescList();
         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;
-        this.callbackObj.detail.nickname = data.nickname;
-        this.callbackObj.detail.mobile = data.mobile;
-        this.callbackObj.detail.baby_name = data.baby_name;
+        this.callbackObj.timestamp = (new Date()).getTime();
       },
       getUserDescList(){
         getUserDescListApi(this.row.id,{limit:1000}).then(res => {

src/components/teacherDetail/customer.vue

@@ -66,7 +66,7 @@
           <template v-if="infoShow == 2">
             <td>{{ index + 1 }}</td>
             <td>{{ customerObj.name }}</td>
-            <td>{{ item.contact_name }}</td>
+            <td style="text-decoration: underline;">{{ item.contact_name }}</td>
             <td>{{ item.contact_phone }}</td>
             <td>{{ item.start_time }}</td>
             <td>{{ (item.duration / 60) % 1 === 0 ? item.duration / 60: (item.duration / 60).toFixed(2) }}min</td>
@@ -110,7 +110,7 @@
           <template v-if="infoShow == 4">
             <td >{{ customerObj.name }}</td>
             <td>{{ item.friend_uid }}</td>
-            <td>{{ item.friend_nickname }}</td>
+            <td  style="text-decoration: underline;"><router-link :to="{path:'/userDetail', query:{userid: item.user_id, teacherid: customerO.id}}" target="_blank">{{ item.friend_nickname }}</router-link></td>
             <td>{{ item.mobile }}</td>
             <td>{{ item.allow_time }}</td>
             <td>{{ item.add_time_long }}min</td>

src/components/user/index.vue

@@ -167,6 +167,17 @@
       userDetail,
       teacherDialog
     },
+    watch: {
+      $route(){
+        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 : '';
+      },
+    },
     mounted() {
       if (this.$route.query.type && this.$route.query.type == 'detail') { // 详情页
         this.inDetail = true

src/components/userDetail/index.vue

@@ -548,8 +548,9 @@
     data() {
       return {
         callbackObj: {
-          id: '',
-          detail: {}
+          user_id: '',
+          teacher_id: '',
+          timestamp: ''
         },
         userList: [],
         yunjiList: [],
@@ -651,6 +652,7 @@
       this.callbackObj.user_id = this.id;
       // this.callbackObj.teacher_id = this.parentDetail.teacher_id ? this.parentDetail.teacher_id : '';
       this.callbackObj.teacher_id = this.parentDetail && this.parentDetail.teacher_id ? this.parentDetail.teacher_id : (this.$route.query.teacherid ? this.$route.query.teacherid : '');
+      this.callbackObj.timestamp = (new Date()).getTime();
     },
     mounted() {
       this.getDetail();
@@ -873,7 +875,7 @@
         if (!this.id) return;
         getUserDetailApi(this.id).then(res => {
           this.detail = res;
-          this.callbackObj.detail = res; // 用户的所有数据
+          // this.callbackObj.detail = res; // 用户的所有数据
           if (res.periods_list) {
             this.periodList = res.periods_list
           }