Parcourir la source

推送 的消息

姜永辉 il y a 1 an
Parent
commit
220d1e374f

+ 469 - 461
package-basic-data/pages/customer-follow-up/customer-follow-up.js

@@ -29,66 +29,66 @@ Page({
     id: '10112024-0407-0000-0000-0000296189a7',
     id: '10112024-0407-0000-0000-0000296189a7',
     contentObj: {
     contentObj: {
       main: [{
       main: [{
-          code: 'cusName',
-          type: 'str',
-          required: true,
-          title: mixins.$t('customerName')
-        },
-        {
-          code: 'cusPhone',
-          type: 'phone',
-          title: mixins.$t('cusPhone'),
-          required: true
-        },
-        {
-          code: 'addressFull',
-          type: 'address',
-          title: mixins.$t('addressFull'),
-          required: false
-        },
-        {
-          code: 'addressNo',
-          type: 'str',
-          required: false,
-          title: mixins.$t('addressNo')
-        },
-        {
-          code: 'intention',
-          name: 'intentionName',
-          type: 'drop',
-          required: true,
-          dropType: 'customerIntention',
-          title: mixins.$t('intention')
-        },
-        {
-          code: 'followType',
-          name: 'followTypeName',
-          type: 'textarea',
-          dropType: 'followType',
-          type: 'drop',
-          required: true,
-          title: mixins.$t('followType')
-        },
-        {
-          code: 'followData',
-          type: 'textarea',
-          required: true,
-          title: mixins.$t('followData')
-        },
-        {
-          code: 'nextFollowTime',
-          type: 'remindDateTime',
-          required: true,
-          title: mixins.$t('nextFollowTime')
-        },
-        {
-          code: 'stayTimeLen',
-          name: 'stayTimeLenName',
-          required: true,
-          title: mixins.$t('stayTimeLen'),
-          dropType: 'storeRetentionTime',
-          type: 'drop',
-        },
+        code: 'cusName',
+        type: 'str',
+        required: true,
+        title: mixins.$t('customerName')
+      },
+      {
+        code: 'cusPhone',
+        type: 'phone',
+        title: mixins.$t('cusPhone'),
+        required: true
+      },
+      {
+        code: 'addressFull',
+        type: 'address',
+        title: mixins.$t('addressFull'),
+        required: false
+      },
+      {
+        code: 'addressNo',
+        type: 'str',
+        required: false,
+        title: mixins.$t('addressNo')
+      },
+      {
+        code: 'intention',
+        name: 'intentionName',
+        type: 'drop',
+        required: true,
+        dropType: 'customerIntention',
+        title: mixins.$t('intention')
+      },
+      {
+        code: 'followType',
+        name: 'followTypeName',
+        type: 'textarea',
+        dropType: 'followType',
+        type: 'drop',
+        required: true,
+        title: mixins.$t('followType')
+      },
+      {
+        code: 'followData',
+        type: 'textarea',
+        required: true,
+        title: mixins.$t('followData')
+      },
+      {
+        code: 'nextFollowTime',
+        type: 'remindDateTime',
+        required: true,
+        title: mixins.$t('nextFollowTime')
+      },
+      {
+        code: 'stayTimeLen',
+        name: 'stayTimeLenName',
+        required: true,
+        title: mixins.$t('stayTimeLen'),
+        dropType: 'storeRetentionTime',
+        type: 'drop',
+      },
       ],
       ],
     },
     },
   },
   },
@@ -252,9 +252,22 @@ Page({
   onLoad(options) {
   onLoad(options) {
     //接收父页面传递的参数
     //接收父页面传递的参数
     let that = this
     let that = this
+    let item = {}
+
+    // 从推送消息过来的数据 
+    if (options.loginType == 2) {
+      // 邀约进店 
+      this.setData({
+        radioFollowUp: options.loginType
+      })
+    }
+    if (options.item) {
+      item = JSON.parse(decodeURIComponent(options.item))
+    }
+
     const eventChannel = this.getOpenerEventChannel()
     const eventChannel = this.getOpenerEventChannel()
     eventChannel.on('params', function (data) {
     eventChannel.on('params', function (data) {
-      let item = that.data.item
+      let item = that.data.item || item
       if (data && data.title) {
       if (data && data.title) {
         wx.setNavigationBarTitle({
         wx.setNavigationBarTitle({
           title: data.title,
           title: data.title,
@@ -265,23 +278,18 @@ Page({
       that.setData({
       that.setData({
         formData: formData
         formData: formData
       })
       })
-    }) 
+    })
     if (this.data.formMode == "sourceCus") { //从客户列表跳转过来的
     if (this.data.formMode == "sourceCus") { //从客户列表跳转过来的
-      let item = that.data.item
+      let item = that.data.item || item
       let formData = that.data.formData ? JSON.parse(that.data.formData) : {}
       let formData = that.data.formData ? JSON.parse(that.data.formData) : {}
       let contentObj = this.data.contentObj
       let contentObj = this.data.contentObj
-      contentObj =  this.setContentObjReadonly(contentObj)   
+      contentObj = this.setContentObjReadonly(contentObj)
       formData = that.setCus(formData, item)
       formData = that.setCus(formData, item)
       that.setData({
       that.setData({
         formData: formData,
         formData: formData,
-        contentObj:contentObj
+        contentObj: contentObj
       })
       })
     }
     }
-   
-    // 从推送消息过来的数据 
-    if (options.item) {
-      let item = JSON.parse(decodeURIComponent(options.item))
-    }
 
 
   },
   },
 
 
@@ -323,410 +331,410 @@ Page({
    */
    */
   setFormContent(radioFollowUp) {
   setFormContent(radioFollowUp) {
     let radioFollowUpList1 = [{
     let radioFollowUpList1 = [{
-        code: 'cusName',
-        type: 'str',
-        required: true,
-        title: mixins.$t('customerName')
-      },
-      {
-        code: 'cusPhone',
-        type: 'phone',
-        title: mixins.$t('cusPhone'),
-        required: true
-      },
-      {
-        code: 'addressFull',
-        type: 'address',
-        title: mixins.$t('addressFull'),
-        required: false
-      },
-      {
-        code: 'addressNo',
-        type: 'str',
-        required: false,
-        title: mixins.$t('addressNo')
-      },
-      {
-        code: 'intention',
-        name: 'intentionName',
-        type: 'drop',
-        required: true,
-        dropType: 'customerIntention',
-        title: mixins.$t('intention')
-      },
-      {
-        code: 'followType',
-        name: 'followTypeName',
-        type: 'textarea',
-        dropType: 'followType',
-        type: 'drop',
-        required: true,
-        title: mixins.$t('followType')
-      },
-      {
-        code: 'followData',
-        type: 'textarea',
-        required: true,
-        title: mixins.$t('followData')
-      },
-      {
-        code: 'nextFollowTime',
-        type: 'remindDateTime',
-        required: true,
-        title: mixins.$t('nextFollowTime')
-      },
-      {
-        code: 'stayTimeLen',
-        name: 'stayTimeLenName',
-        required: true,
-        title: mixins.$t('stayTimeLen'),
-        dropType: 'storeRetentionTime',
-        type: 'drop',
-      },
+      code: 'cusName',
+      type: 'str',
+      required: true,
+      title: mixins.$t('customerName')
+    },
+    {
+      code: 'cusPhone',
+      type: 'phone',
+      title: mixins.$t('cusPhone'),
+      required: true
+    },
+    {
+      code: 'addressFull',
+      type: 'address',
+      title: mixins.$t('addressFull'),
+      required: false
+    },
+    {
+      code: 'addressNo',
+      type: 'str',
+      required: false,
+      title: mixins.$t('addressNo')
+    },
+    {
+      code: 'intention',
+      name: 'intentionName',
+      type: 'drop',
+      required: true,
+      dropType: 'customerIntention',
+      title: mixins.$t('intention')
+    },
+    {
+      code: 'followType',
+      name: 'followTypeName',
+      type: 'textarea',
+      dropType: 'followType',
+      type: 'drop',
+      required: true,
+      title: mixins.$t('followType')
+    },
+    {
+      code: 'followData',
+      type: 'textarea',
+      required: true,
+      title: mixins.$t('followData')
+    },
+    {
+      code: 'nextFollowTime',
+      type: 'remindDateTime',
+      required: true,
+      title: mixins.$t('nextFollowTime')
+    },
+    {
+      code: 'stayTimeLen',
+      name: 'stayTimeLenName',
+      required: true,
+      title: mixins.$t('stayTimeLen'),
+      dropType: 'storeRetentionTime',
+      type: 'drop',
+    },
     ]
     ]
 
 
     let radioFollowUpList11 = [{
     let radioFollowUpList11 = [{
-        code: 'cusName',
-        type: 'str',
-        required: false,
-        title: mixins.$t('customerName'),
-        readonly: true
-      },
-      {
-        code: 'cusPhone',
-        type: 'str',
-        required: false,
-        title: mixins.$t('cusPhone'),
-        readonly: true
-      },
-      {
-        code: 'addressFull',
-        type: 'str',
-        required: false,
-        title: mixins.$t('addressFull'),
-        readonly: true
-      },
-      {
-        code: 'addressNo',
-        type: 'str',
-        required: false,
-        title: mixins.$t('addressNo'),
-        readonly: true
-      },
-      {
-        code: 'intentionName',
-        type: 'str',
-        required: false,
-        title: mixins.$t('intention'),
-        readonly: true
-      },
-      {
-        code: 'followData',
-        type: 'textarea',
-        required: false,
-        title: mixins.$t('followData'),
-        readonly: true
-      },
-      {
-        code: 'followTypeName',
-        type: 'textarea',
-        required: false,
-        title: mixins.$t('followType'),
-        readonly: true
-      },
-      {
-        code: 'nextFollowTime',
-        type: 'str',
-        required: false,
-        title: mixins.$t('nextFollowTime'),
-        readonly: true
-      },
-      {
-        code: 'stayTimeLenName',
-        type: 'str',
-        required: false,
-        title: mixins.$t('stayTimeLen'),
-        readonly: true
-      },
+      code: 'cusName',
+      type: 'str',
+      required: false,
+      title: mixins.$t('customerName'),
+      readonly: true
+    },
+    {
+      code: 'cusPhone',
+      type: 'str',
+      required: false,
+      title: mixins.$t('cusPhone'),
+      readonly: true
+    },
+    {
+      code: 'addressFull',
+      type: 'str',
+      required: false,
+      title: mixins.$t('addressFull'),
+      readonly: true
+    },
+    {
+      code: 'addressNo',
+      type: 'str',
+      required: false,
+      title: mixins.$t('addressNo'),
+      readonly: true
+    },
+    {
+      code: 'intentionName',
+      type: 'str',
+      required: false,
+      title: mixins.$t('intention'),
+      readonly: true
+    },
+    {
+      code: 'followData',
+      type: 'textarea',
+      required: false,
+      title: mixins.$t('followData'),
+      readonly: true
+    },
+    {
+      code: 'followTypeName',
+      type: 'textarea',
+      required: false,
+      title: mixins.$t('followType'),
+      readonly: true
+    },
+    {
+      code: 'nextFollowTime',
+      type: 'str',
+      required: false,
+      title: mixins.$t('nextFollowTime'),
+      readonly: true
+    },
+    {
+      code: 'stayTimeLenName',
+      type: 'str',
+      required: false,
+      title: mixins.$t('stayTimeLen'),
+      readonly: true
+    },
     ]
     ]
     let radioFollowUpList2 = [{
     let radioFollowUpList2 = [{
-        code: 'cusName',
-        type: 'str',
-        required: true,
-        title: mixins.$t('customerName')
-      },
-      {
-        code: 'cusPhone',
-        type: 'phone',
-        title: mixins.$t('cusPhone'),
-        required: true
-      },
-      {
-        code: 'addressFull',
-        type: 'address',
-        title: mixins.$t('addressFull'),
-        required: false
-      },
-      {
-        code: 'addressNo',
-        type: 'str',
-        required: false,
-        title: mixins.$t('addressNo')
-      },
-      {
-        code: 'inviteResult',
-        name: 'inviteResultName',
-        type: 'drop',
-        required: true,
-        dropType: 'inviteResult',
-        title: mixins.$t('inviteResult')
-      },
-      {
-        code: 'inviteTime',
-        type: 'dateTime',
-        required: false,
-        title: mixins.$t('inviteTime')
-      },
-      {
-        code: 'intention',
-        name: 'intentionName',
-        type: 'drop',
-        required: true,
-        dropType: 'customerIntention',
-        title: mixins.$t('intention')
-      },
-      // { code: 'followType', name: 'followTypeName', type: 'textarea', dropType: 'followType', type: 'drop', required: true, title: mixins.$t('followType') },
-      {
-        code: 'followData',
-        type: 'textarea',
-        required: true,
-        title: mixins.$t('followData')
-      },
-      {
-        code: 'nextFollowPlan',
-        type: 'textarea',
-        required: false,
-        title: mixins.$t('nextFollowPlan')
-      },
-      {
-        code: 'nextFollowTime',
-        type: 'remindDateTime',
-        required: true,
-        title: mixins.$t('nextFollowTime')
-      },
+      code: 'cusName',
+      type: 'str',
+      required: true,
+      title: mixins.$t('customerName')
+    },
+    {
+      code: 'cusPhone',
+      type: 'phone',
+      title: mixins.$t('cusPhone'),
+      required: true
+    },
+    {
+      code: 'addressFull',
+      type: 'address',
+      title: mixins.$t('addressFull'),
+      required: false
+    },
+    {
+      code: 'addressNo',
+      type: 'str',
+      required: false,
+      title: mixins.$t('addressNo')
+    },
+    {
+      code: 'inviteResult',
+      name: 'inviteResultName',
+      type: 'drop',
+      required: true,
+      dropType: 'inviteResult',
+      title: mixins.$t('inviteResult')
+    },
+    {
+      code: 'inviteTime',
+      type: 'dateTime',
+      required: false,
+      title: mixins.$t('inviteTime')
+    },
+    {
+      code: 'intention',
+      name: 'intentionName',
+      type: 'drop',
+      required: true,
+      dropType: 'customerIntention',
+      title: mixins.$t('intention')
+    },
+    // { code: 'followType', name: 'followTypeName', type: 'textarea', dropType: 'followType', type: 'drop', required: true, title: mixins.$t('followType') },
+    {
+      code: 'followData',
+      type: 'textarea',
+      required: true,
+      title: mixins.$t('followData')
+    },
+    {
+      code: 'nextFollowPlan',
+      type: 'textarea',
+      required: false,
+      title: mixins.$t('nextFollowPlan')
+    },
+    {
+      code: 'nextFollowTime',
+      type: 'remindDateTime',
+      required: true,
+      title: mixins.$t('nextFollowTime')
+    },
     ]
     ]
     let radioFollowUpList22 = [{
     let radioFollowUpList22 = [{
-        code: 'cusName',
-        type: 'str',
-        required: false,
-        title: mixins.$t('customerName'),
-        readonly: true
-      },
-      {
-        code: 'cusPhone',
-        type: 'str',
-        required: false,
-        title: mixins.$t('cusPhone'),
-        readonly: true
-      },
-      {
-        code: 'addressFull',
-        type: 'str',
-        required: false,
-        title: mixins.$t('addressFull'),
-        readonly: true
-      },
-      {
-        code: 'addressNo',
-        type: 'str',
-        required: false,
-        title: mixins.$t('addressNo'),
-        readonly: true
-      },
-      {
-        code: 'inviteResult',
-        type: 'str',
-        required: false,
-        title: mixins.$t('inviteResult'),
-        readonly: true
-      },
-      {
-        code: 'inviteTime',
-        type: 'str',
-        required: false,
-        title: mixins.$t('inviteTime'),
-        readonly: true
-      },
-      {
-        code: 'intentionName',
-        type: 'str',
-        required: false,
-        title: mixins.$t('intention'),
-        readonly: true
-      },
-      // { code: 'followName', type: 'textarea', required: false, title: mixins.$t('followType'), readonly: true },
+      code: 'cusName',
+      type: 'str',
+      required: false,
+      title: mixins.$t('customerName'),
+      readonly: true
+    },
+    {
+      code: 'cusPhone',
+      type: 'str',
+      required: false,
+      title: mixins.$t('cusPhone'),
+      readonly: true
+    },
+    {
+      code: 'addressFull',
+      type: 'str',
+      required: false,
+      title: mixins.$t('addressFull'),
+      readonly: true
+    },
+    {
+      code: 'addressNo',
+      type: 'str',
+      required: false,
+      title: mixins.$t('addressNo'),
+      readonly: true
+    },
+    {
+      code: 'inviteResult',
+      type: 'str',
+      required: false,
+      title: mixins.$t('inviteResult'),
+      readonly: true
+    },
+    {
+      code: 'inviteTime',
+      type: 'str',
+      required: false,
+      title: mixins.$t('inviteTime'),
+      readonly: true
+    },
+    {
+      code: 'intentionName',
+      type: 'str',
+      required: false,
+      title: mixins.$t('intention'),
+      readonly: true
+    },
+    // { code: 'followName', type: 'textarea', required: false, title: mixins.$t('followType'), readonly: true },
 
 
-      {
-        code: 'followData',
-        type: 'textarea',
-        required: false,
-        title: mixins.$t('followData'),
-        readonly: true
-      },
-      {
-        code: 'nextFollowPlan',
-        type: 'textarea',
-        required: false,
-        title: mixins.$t('nextFollowPlan'),
-        readonly: true
-      },
-      {
-        code: 'nextFollowTime',
-        type: 'str',
-        required: false,
-        title: mixins.$t('nextFollowTime'),
-        readonly: true
-      },
+    {
+      code: 'followData',
+      type: 'textarea',
+      required: false,
+      title: mixins.$t('followData'),
+      readonly: true
+    },
+    {
+      code: 'nextFollowPlan',
+      type: 'textarea',
+      required: false,
+      title: mixins.$t('nextFollowPlan'),
+      readonly: true
+    },
+    {
+      code: 'nextFollowTime',
+      type: 'str',
+      required: false,
+      title: mixins.$t('nextFollowTime'),
+      readonly: true
+    },
     ]
     ]
     let radioFollowUpList3 = [{
     let radioFollowUpList3 = [{
-        code: 'cusName',
-        type: 'str',
-        required: true,
-        title: mixins.$t('customerName')
-      },
-      {
-        code: 'cusPhone',
-        type: 'phone',
-        title: mixins.$t('cusPhone'),
-        required: true
-      },
-      {
-        code: 'addressFull',
-        type: 'address',
-        title: mixins.$t('addressFull'),
-        required: false
-      },
-      {
-        code: 'addressNo',
-        type: 'str',
-        required: false,
-        title: mixins.$t('addressNo')
-      },
-      {
-        code: 'designStaff',
-        name: 'designStaffName',
-        type: 'drop',
-        required: true,
-        dropType: 'staff',
-        title: mixins.$t('followStaff')
-      },
-      {
-        code: 'inviteResult',
-        name: 'inviteResultName',
-        type: 'drop',
-        required: true,
-        dropType: 'inviteResult',
-        title: mixins.$t('inviteResult')
-      },
-      // { code: 'followType', name: 'followTypeName', type: 'textarea', dropType: 'followType', type: 'drop', required: true, title: mixins.$t('followType') },
-      {
-        code: 'followTime',
-        type: 'dateTime',
-        required: true,
-        title: mixins.$t('nextFollowTimeS')
-      },
-      {
-        code: 'followData',
-        type: 'textarea',
-        required: true,
-        title: mixins.$t('followData')
-      },
-      {
-        code: 'nextFollowPlan',
-        type: 'textarea',
-        required: false,
-        title: mixins.$t('nextFollowPlan')
-      },
-      {
-        code: 'nextFollowTime',
-        type: 'remindDateTime',
-        required: true,
-        title: mixins.$t('nextFollowTime')
-      },
+      code: 'cusName',
+      type: 'str',
+      required: true,
+      title: mixins.$t('customerName')
+    },
+    {
+      code: 'cusPhone',
+      type: 'phone',
+      title: mixins.$t('cusPhone'),
+      required: true
+    },
+    {
+      code: 'addressFull',
+      type: 'address',
+      title: mixins.$t('addressFull'),
+      required: false
+    },
+    {
+      code: 'addressNo',
+      type: 'str',
+      required: false,
+      title: mixins.$t('addressNo')
+    },
+    {
+      code: 'designStaff',
+      name: 'designStaffName',
+      type: 'drop',
+      required: true,
+      dropType: 'staff',
+      title: mixins.$t('followStaff')
+    },
+    {
+      code: 'inviteResult',
+      name: 'inviteResultName',
+      type: 'drop',
+      required: true,
+      dropType: 'inviteResult',
+      title: mixins.$t('inviteResult')
+    },
+    // { code: 'followType', name: 'followTypeName', type: 'textarea', dropType: 'followType', type: 'drop', required: true, title: mixins.$t('followType') },
+    {
+      code: 'followTime',
+      type: 'dateTime',
+      required: true,
+      title: mixins.$t('nextFollowTimeS')
+    },
+    {
+      code: 'followData',
+      type: 'textarea',
+      required: true,
+      title: mixins.$t('followData')
+    },
+    {
+      code: 'nextFollowPlan',
+      type: 'textarea',
+      required: false,
+      title: mixins.$t('nextFollowPlan')
+    },
+    {
+      code: 'nextFollowTime',
+      type: 'remindDateTime',
+      required: true,
+      title: mixins.$t('nextFollowTime')
+    },
 
 
     ]
     ]
     let radioFollowUpList33 = [{
     let radioFollowUpList33 = [{
-        code: 'cusName',
-        type: 'str',
-        required: false,
-        title: mixins.$t('customerName'),
-        readonly: true
-      },
-      {
-        code: 'cusPhone',
-        type: 'str',
-        required: false,
-        title: mixins.$t('cusPhone'),
-        readonly: true
-      },
-      {
-        code: 'addressFull',
-        type: 'str',
-        required: false,
-        title: mixins.$t('addressFull'),
-        readonly: true
-      },
-      {
-        code: 'addressNo',
-        type: 'str',
-        required: false,
-        title: mixins.$t('addressNo'),
-        readonly: true
-      },
-      {
-        code: 'designStaffName',
-        type: 'str',
-        required: false,
-        title: mixins.$t('followStaff'),
-        readonly: true
-      },
+      code: 'cusName',
+      type: 'str',
+      required: false,
+      title: mixins.$t('customerName'),
+      readonly: true
+    },
+    {
+      code: 'cusPhone',
+      type: 'str',
+      required: false,
+      title: mixins.$t('cusPhone'),
+      readonly: true
+    },
+    {
+      code: 'addressFull',
+      type: 'str',
+      required: false,
+      title: mixins.$t('addressFull'),
+      readonly: true
+    },
+    {
+      code: 'addressNo',
+      type: 'str',
+      required: false,
+      title: mixins.$t('addressNo'),
+      readonly: true
+    },
+    {
+      code: 'designStaffName',
+      type: 'str',
+      required: false,
+      title: mixins.$t('followStaff'),
+      readonly: true
+    },
 
 
-      {
-        code: 'inviteResultName',
-        type: 'str',
-        required: false,
-        title: mixins.$t('inviteResult'),
-        readonly: true
-      },
-      // { code: 'followTypeName', type: 'str', required: false, title: mixins.$t('followType'), readonly: true },
-      {
-        code: 'followTime',
-        type: 'str',
-        required: false,
-        title: mixins.$t('nextFollowTimeS'),
-        readonly: true
-      },
-      {
-        code: 'followData',
-        type: 'textarea',
-        required: false,
-        title: mixins.$t('followData'),
-        readonly: true
-      },
-      {
-        code: 'nextFollowPlan',
-        type: 'textarea',
-        required: false,
-        title: mixins.$t('nextFollowPlan'),
-        readonly: true
-      },
-      {
-        code: 'nextFollowTime',
-        type: 'str',
-        required: false,
-        title: mixins.$t('nextFollowTime'),
-        readonly: true
-      },
+    {
+      code: 'inviteResultName',
+      type: 'str',
+      required: false,
+      title: mixins.$t('inviteResult'),
+      readonly: true
+    },
+    // { code: 'followTypeName', type: 'str', required: false, title: mixins.$t('followType'), readonly: true },
+    {
+      code: 'followTime',
+      type: 'str',
+      required: false,
+      title: mixins.$t('nextFollowTimeS'),
+      readonly: true
+    },
+    {
+      code: 'followData',
+      type: 'textarea',
+      required: false,
+      title: mixins.$t('followData'),
+      readonly: true
+    },
+    {
+      code: 'nextFollowPlan',
+      type: 'textarea',
+      required: false,
+      title: mixins.$t('nextFollowPlan'),
+      readonly: true
+    },
+    {
+      code: 'nextFollowTime',
+      type: 'str',
+      required: false,
+      title: mixins.$t('nextFollowTime'),
+      readonly: true
+    },
 
 
     ]
     ]
     let contentObj = this.data.contentObj
     let contentObj = this.data.contentObj
@@ -741,7 +749,7 @@ Page({
       contentObj.main = this.data.formType == 'detail' ? radioFollowUpList33 : radioFollowUpList3
       contentObj.main = this.data.formType == 'detail' ? radioFollowUpList33 : radioFollowUpList3
     }
     }
 
 
-      contentObj =  this.setContentObjReadonly(contentObj)
+    contentObj = this.setContentObjReadonly(contentObj)
     this.setData({
     this.setData({
       contentObj: contentObj
       contentObj: contentObj
     })
     })

+ 6 - 2
package-basic-data/pages/customer-reception/measure-to/measure-to.js

@@ -317,10 +317,14 @@ Page({
   onLoad(options) {
   onLoad(options) {
     //接收父页面传递的参数
     //接收父页面传递的参数
     let that = this
     let that = this
-    // Constants.formMode.edit
+    let item = {}
+    // 从推送消息过来的数据  
+    if (options.item) {
+      item = JSON.parse(decodeURIComponent(options.item))
+    }
     const eventChannel = this.getOpenerEventChannel()
     const eventChannel = this.getOpenerEventChannel()
     eventChannel.on('params', function (data) {
     eventChannel.on('params', function (data) {
-      let item = that.data.item
+      let item = that.data.item || item
       let formData = that.setCus(JSON.parse(that.data.formData), item)
       let formData = that.setCus(JSON.parse(that.data.formData), item)
       that.setData({
       that.setData({
         formData: formData
         formData: formData

+ 7 - 9
pages/home-page/home-page.js

@@ -674,25 +674,23 @@ Page({
     }
     }
     else if (options.loginType == 2) {
     else if (options.loginType == 2) {
       options.otherParam = util.copyObj(options.otherParam.replace(/'/g, '"'))
       options.otherParam = util.copyObj(options.otherParam.replace(/'/g, '"'))
-      // 客户跟进通知-进入接待详情 
-
+      // 邀约进店 
       wx.navigateTo({        
       wx.navigateTo({        
-        url: '/package-basic-data/pages/customer-reception/customer-reception?item=' + encodeURIComponent(options.otherParam),
+        url: '/package-basic-data/pages/customer-follow-up/customer-follow-up?loginType=2&item=' + encodeURIComponent(options.otherParam),
       })
       })
     } 
     } 
     else if (options.loginType == 3) {
     else if (options.loginType == 3) {
+      // 3 约尺
       options.otherParam = util.copyObj(options.otherParam.replace(/'/g, '"')) 
       options.otherParam = util.copyObj(options.otherParam.replace(/'/g, '"')) 
       wx.navigateTo({
       wx.navigateTo({
-        url: '/package-basic-data/pages/customer-reception/measure-to/measure-to' + '&item=' + encodeURIComponent(options.otherParam),
+        url: '/package-basic-data/pages/customer-reception/measure-to/measure-to?loginType= 3' + '&item=' + encodeURIComponent(options.otherParam),
       })
       })
-    } 
-    
+    }     
     else if (options.loginType == 4) {
     else if (options.loginType == 4) {
       options.otherParam = util.copyObj(options.otherParam.replace(/'/g, '"'))
       options.otherParam = util.copyObj(options.otherParam.replace(/'/g, '"'))
-      // 客户跟进通知-进入接待详情 
-
+      // 4 5 接待或跟进       
       wx.navigateTo({        
       wx.navigateTo({        
-        url: '/package-basic-data/pages/customer-reception/customer-reception?item=' + encodeURIComponent(options.otherParam),
+        url: '/package-basic-data/pages/customer-follow-up/customer-follow-up?item=' + encodeURIComponent(options.otherParam),
       })
       })
     }
     }