Merge branch 'main' of http://git.ycjcjy.com/marketing/miniapp into main

config/index.js

@@ -29,7 +29,7 @@ const config = {
   },
   copy: {
     patterns: [
-      { from: 'src/native/', to: 'dist/native/' },
+      // { from: 'src/native/', to: 'dist/native/' },
     ],
     options: {
     }
@@ -37,9 +37,9 @@ const config = {
   framework: 'react',
   mini: {
     compile: {
-      exclude: [
-        path.resolve(__dirname, '..', 'src/native/')
-      ]
+      // exclude: [
+      //   path.resolve(__dirname, '..', 'src/native/')
+      // ]
     },
     postcss: {
       pxtransform: {

config/prod.js

@@ -3,10 +3,10 @@ module.exports = {
     NODE_ENV: '"production"'
   },
   defineConstants: {
-    // HOST: '"https://xlj.newlandsh.com"', //正式
-    // WSS_HOST: '"wss://xlj.newlandsh.com"',
-    HOST: '"https://xlk.njyz.tech"', //正式
-    WSS_HOST: '"wss://xlk.njyz.tech"',
+    HOST: '"https://xlj.newlandsh.com"', //正式
+    WSS_HOST: '"wss://xlj.newlandsh.com"',
+    // HOST: '"https://xlk.njyz.tech"', //正式
+    // WSS_HOST: '"wss://xlk.njyz.tech"',
     OSS_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
     OSS_FAST_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
     ICON_FONT: '"https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/css/iconfont.ttf"',

src/components/Picker/index.jsx

@@ -49,6 +49,7 @@ export default (props) => {
       onChange={handleChange}
       value={inx}
       range={dicts}
+      mode={mode||'selector'}
       {...leftProps}
     >
       <View>{text || placeholder || '请选择'}</View>

src/constants/api.js

@@ -145,7 +145,7 @@ export const API_CHANNEL_REPORT = resolvePath('channel/report')
 export const API_MANAGE_CUSTOMER_LIST = resolvePath('marking/customers')
 export const API_TOBE_MANAGER = resolvePath('marketing')
 export const API_MY_BUILDINGIDS = resolvePath('building/mine')
-export const API_MARKETING_VISIT = resolvePath('marketing/visit')
+export const API_MARKETING_VISIT = resolvePath('marking//visit')
 
 
 // report

src/pages/mine/changeVisit/index.jsx

@@ -69,12 +69,12 @@ export default withLayout((props) => {
   }, [buildingId])
 
   useEffect(() => {
-    if (CurrentStatusId - 0 !== 3) {
+    if (CurrentStatusId - 0 !== 3 && buildingId) {
       fetch({ url: `${API_BUILDING_HOUSE_TYPE}?buildingId=${buildingId}&pageSize=${500}`, method: 'get' }).then((res) => {
         setHouseTypeList(res.records || [])
       })
     }
-  }, [CurrentStatusId])
+  }, [CurrentStatusId, buildingId])
 
   const CutStatus = (item) => {
     return () => {
@@ -101,9 +101,12 @@ export default withLayout((props) => {
   const InputChange = (key, e) => {
     let resData = { ...FormData }
     resData[key] = e.detail.value
+    console.log('---------resData---------', resData)
     setFormData({ ...resData })
   }
 
+  console.log('---------FormData---------', FormData)
+
   const PickerChange = (key, e) => {
     let resData = { ...FormData }
     if (key === 'realtyConsultant') {

src/pages/mine/components/ResidentListItem/index.jsx

@@ -18,7 +18,7 @@ export default function ResidentListItem (props) {
           <text className='Status'>已报备</text>
         }
         {
-          data.customerStatus - 0 === 2 && !(data.type === 'report' && data.channelStatus === 3) &&
+          data.type === 'report' && (data.channelStatus - 0) === 1 &&
           <text className='Status' onClick={() => { Taro.navigateTo({ url: `/pages/mine/sureVisit/index?id=${data.id}` }) }}>到访确认</text>
         }
       </view>

src/pages/mine/sureVisit/index.jsx

@@ -11,7 +11,8 @@ import '@/assets/css/iconfont.css'
 import './index.scss'
 
 export default withLayout((props) => {
-  const { id } = props
+  const { router } = props
+  const { id } = router.params
 
   const [loading, setLoading] = useState(false)
   const [channelCustomer, setChannelCustomer] = useState({})
@@ -56,7 +57,7 @@ export default withLayout((props) => {
         recommendPerson: channelCustomer.recommendPerson,
         realtyConsultant: consultant,
         imageUrl,
-        visitDate: `${visitDate}T12.00.00.000Z`,  // 随便造了一个时刻
+        visitDate: `${visitDate}T12:00:00.000Z`,  // 随便造了一个时刻
         remark,
         channelId: channelCustomer.channelId,
       }
@@ -66,7 +67,7 @@ export default withLayout((props) => {
     fetch({ url: API_MARKETING_VISIT, payload, method: 'PUT' }).then((res) => {
       setLoading(false)
       Taro.showToast({
-        url: '操作成功',
+        title: '操作成功',
         icon: 'none'
       })
       const t = setTimeout(() => {