Merge branch 'client' into dev

packageA/setclient/modules/contacts/detail/index.js

@@ -36,17 +36,12 @@ Page({
             this.setData({
                 detail: item,
                 briefs: [{
-                        label: "单位",
-                        value: item.enterprisename
-                    }, {
-                        label: "联系方式",
-                        value: item.phonenumber
-                    }
-                    /* , {
-                                        label: "最近跟进时间",
-                                        value: ""
-                                    } */
-                ],
+                    label: "单位",
+                    value: item.enterprisename
+                }, {
+                    label: "联系方式",
+                    value: item.phonenumber
+                }],
                 list1: [{
                     label: "姓名",
                     value: item.name
@@ -82,11 +77,11 @@ Page({
                     value: item.remarks
                 }],
                 list2: [{
-                    label: "职位",
-                    value: item.position
+                    label: "创建人",
+                    value: item.createby
                 }, {
-                    label: "备注",
-                    value: item.remarks
+                    label: "创建时间",
+                    value: item.createdate
                 }]
             });
             this.getTags()

packageA/setclient/modules/contacts/detail/index.json

@@ -1,6 +1,7 @@
 {
     "usingComponents": {
-        "Trace": "../../trace/index"
+        "Trace": "../../trace/index",
+        "preview": "../../preview/index"
     },
     "navigationBarTitleText": "联系人详情"
 }

packageA/setclient/modules/contacts/detail/index.wxml

@@ -22,8 +22,12 @@
 <!-- 功能 -->
 <Yl_FunTabs list='{{tabsList}}' active='{{tabsActive}}' bind:onChenge="tabsChange">
     <view slot='详细信息'>
-        <Yl_Headline title='基本信息' type='switch' switchLabel='仅显示已填信息' switch='{{showAll}}' bind:callBack='onChange' />
-        <Yl_ReportForms showAll='{{!showAll}}' list='{{list1}}' list1='{{list1}}' />
+        <!-- <Yl_Headline title='基本信息' type='switch' switchLabel='仅显示已填信息' switch='{{showAll}}' bind:callBack='onChange' /> -->
+        <preview showAll='{{!showAll}}' list1='{{list1}}' list2='{{list2}}' />
+
+
+
+
         <!--  <Yl_Headline title='系统信息' />
         <Yl_ReportForms showAll='{{!showAll}}' list='{{list2}}' /> -->
     </view>