Merge branch 'v4' of http://git.ycjcjy.com/zhiyuxing/miniapp-v3 into v4

# Conflicts:
#	config/dev.js
#	config/prod.js

config/dev.js

@@ -10,7 +10,7 @@ module.exports = {
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
     HOST: '"http://192.168.0.84:8080"',
-    WSS_HOST: '"wss://192.168.0.84:8080"',
+    WSS_HOST: '"ws://192.168.0.84:8080"',
   },
   weapp: {},
   h5: {}

config/prod.js

@@ -3,8 +3,8 @@ module.exports = {
     NODE_ENV: '"production"'
   },
   defineConstants: {
-    HOST: '"http://192.168.0.84:8080"',
-    WSS_HOST: '"wss://192.168.0.84:8080"',
+    HOST: '"https://dev.jinchengjiaye.com"',
+    WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
   },

src/actions/user.js

@@ -12,7 +12,8 @@ import {
   API_USER_SIGNIN,
   API_QUERY_CUSTOMER_INFO,
   API_QUERY_MYREPORT,
-  API_QUERY_USERINFO_BYID
+  API_QUERY_USERINFO_BYID,
+  API_QUERY_DOCUMENTVERIFY
 } from '@constants/api'
 
 import { createAction,createActionNormal } from '@utils/redux'
@@ -71,6 +72,7 @@ export const dispatchCustomerInfo = payload => createAction({
   payload,
   method: 'GET'
 })
+
 /**
  * 我报备的客户列表
  * @param {*} payload

src/app.js

@@ -6,6 +6,7 @@ import "@components/wxParse/wxParse.scss";
 import Index from './pages/auth/index'
 import { Provider } from '@tarojs/redux'
 import { getQueryString } from '@utils/tools'
+
 import {
   getCodeScene,
   savePoint,
@@ -39,39 +40,35 @@ class App extends Component {
       }
     },
     pages: [
-      'pages/person/index',
       'pages/project/index',
+      'pages/person/index',
+      'pages/activity/activity',
+      'pages/person/profile/index',
+      'pages/shop/index',
+      'pages/project/detail/index',
       'pages/activity/assemblePage',
       'pages/activity/assistancePage',
-      'pages/activity/activity',
       'pages/person/spread/index',
       'pages/card/index',
       'pages/agent/become/index',
       'pages/im/list/index',
       'pages/agent/invitation/index',
       'pages/agent/client/index',
-
       'pages/person/myGuest/index',
       'pages/person/personDetail/index',
       'pages/person/personDetail/editDetail/index',
-
       'pages/person/login/index',
-
       'pages/person/myGuest/editGuest/index',
       'pages/shop/rule/index',
       'pages/person/authorize/index',
       'pages/project/map/index',
-      'pages/shop/index',
       'pages/agent/index',
-
-
       'pages/shop/integralDetail/index',
       'pages/auth/index',
       'pages/card/list/index',
       'pages/agent/recommend/index',
       // 'pages/activity/index',
       'pages/report/index',
-      'pages/project/detail/index',
       'pages/project/list/index',
       'pages/report/login/index',
       'pages/project/floor/index',
@@ -96,6 +93,11 @@ class App extends Component {
       'pages/signin/index',
       'pages/card/fans/index',
       'pages/person/feedback/index',
+
+      'pages/checkin/index',
+      'pages/checkin/checkinsuccess/index',
+      // 'pages/checkin/unregistered/index',
+  
     ],
     window: {
       backgroundTextStyle: 'light',
@@ -107,6 +109,7 @@ class App extends Component {
     tabBar: {
       color: '#666',
       selectedColor: '#BB9C79',
+      
       list: [
         {
           pagePath: "pages/project/index",