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

.vscode/settings.json

@@ -1,4 +1,6 @@
 {
   "editor.fontFamily": "'Cascadia Code', Consolas, 'Courier New', monospace",
-  "editor.tabSize": 2
+  "editor.tabSize": 2,
+  "javascript.implicitProjectConfig.experimentalDecorators": true,
+  "prettier.singleQuote": true
 }

jsconfig.json

@@ -2,6 +2,7 @@
 
 {
   "compilerOptions": {
+    "experimentalDecorators": true,
     "baseUrl": ".",
     "paths": {      
       "@/actions/*": ["./src/actions/*"],

src/constants/common.js

@@ -14,7 +14,7 @@ export const TPL_HOUSE = "house";
 export const TPL_SIGN = "contract-signing";
 
 // 更新预拉取数据
-export const UPDATE_PRELOAD = 'UPDATE_PRELOAD';
+export const UPDATE_PRELOAD = "UPDATE_PRELOAD";
 
 // 同步系统信息
-export const SYNC_SYSTEMINFO = 'SYNC_SYSTEMINFO';
+export const SYNC_SYSTEMINFO = "SYNC_SYSTEMINFO";

src/pages/project/h5Page.js

@@ -1,25 +1,28 @@
-import Taro, { Component } from '@tarojs/taro'
-import * as actions from '@/actions/user'
-import getUserPhone from '@/utils/getUserPhone'
-import './index.scss'
-import { getHFiveDetail } from '@/services/user'
-import ready from '@/utils/ready'
-import { reportClient } from '@/services/report'
-import { connect } from '@tarojs/redux'
-import { ROLE_CODE } from '@/constants/user'
-import { getQrCodeParams } from '@/utils/qrcode'
-import { getMiniQrcode, savePoint, updatePoint } from '@/services/common'
-import { isEmpty, parseURL } from '@/utils/tools'
-import { rule as ruleToast } from '@/utils/ruleToast'
-import { share as shareSavePoint } from '@/utils/shareSavePoint'
-import { report as reportCustomer } from '@/utils/customer'
-
-const bgImg = "https://njcj.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/bg.png"
-
-@connect(state => state.user, { ...actions })
-
+import Taro, { Component } from "@tarojs/taro";
+import * as actions from "@/actions/user";
+import getUserPhone from "@/utils/getUserPhone";
+import { getHFiveDetail } from "@/services/user";
+import ready from "@/utils/ready";
+// import { reportClient } from "@/services/report";
+import { connect } from "@tarojs/redux";
+import { ROLE_CODE } from "@/constants/user";
+import { getQrCodeParams } from "@/utils/qrcode";
+import { getMiniQrcode, savePoint, updatePoint } from "@/services/common";
+import { isEmpty, parseURL, mergeQueryParams } from "@/utils/tools";
+import { rule as ruleToast } from "@/utils/ruleToast";
+import { share as shareSavePoint } from "@/utils/shareSavePoint";
+import { report as reportCustomer } from "@/utils/customer";
+
+import "./index.scss";
+
+const bgImg =
+  "https://njcj.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/bg.png";
+
+@connect(
+  state => state.user,
+  { ...actions }
+)
 export default class Index extends Component {
-
   state = {
     recordId: undefined, // 埋点ID
     avatarVisible: false,
@@ -30,119 +33,128 @@ export default class Index extends Component {
     codeParams: {}, // 解析二维码参数
     h5Id: undefined,
     reportedCustomer: false,
-    buildingId: undefined,
-  }
+    buildingId: undefined
+  };
 
   componentWillMount() {
     ready.queue(() => {
-      Taro.showLoading()
+      Taro.showLoading();
       if (this.$router.params.scene) {
-        getQrCodeParams(this.$router.params.scene).then((res) => {
-          console.log(res, "解析二维码返回值")
-          this.setState({
-            codeParams: res || {},
-            h5Id: res.id,
-            buildingId: res.buildingId || '',
-          }, () => {
-            if (isEmpty(res.id)) {
-              Taro.showModal({
-                title: '提示',
-                content: '活动不存在',
-                success: (res) => {
-                  if (res.confirm) {
-                    this.gotoIndex()
+        getQrCodeParams(this.$router.params.scene).then(res => {
+          console.log(res, "解析二维码返回值");
+          this.setState(
+            {
+              codeParams: res || {},
+              h5Id: res.id,
+              buildingId: res.buildingId || ""
+            },
+            () => {
+              if (isEmpty(res.id)) {
+                Taro.showModal({
+                  title: "提示",
+                  content: "活动不存在",
+                  success: res => {
+                    if (res.confirm) {
+                      this.gotoIndex();
+                    }
                   }
-                },
-              })
-              return;
-            }
+                });
+                return;
+              }
 
-            if (!isEmpty(this.state.h5Id)) {
-              this.loadH5Profile(res.id)
+              if (!isEmpty(this.state.h5Id)) {
+                this.loadH5Profile(res.id);
+              }
+              this.avatarPhone();
             }
-            this.avatarPhone()
-          })
-        })
+          );
+        });
       } else {
-        const hFiveId = this.$router.params.id
+        const hFiveId = this.$router.params.id;
         // 没有 H5ID, 也没有分享
         if (isEmpty(hFiveId)) {
           Taro.showModal({
-            title: '提示',
-            content: '活动不存在',
-            success: (res) => {
+            title: "提示",
+            content: "活动不存在",
+            success: res => {
               if (res.confirm) {
-                this.gotoIndex()
+                this.gotoIndex();
               }
-            },
-          })
+            }
+          });
           return;
         }
 
         if (!isEmpty(hFiveId)) {
-          this.loadH5Profile(hFiveId)
+          this.loadH5Profile(hFiveId);
         }
 
-        this.avatarPhone()
-
+        this.avatarPhone();
       }
-    })
+    });
   }
 
   avatarPhone() {
-    const { userInfo: { person: { avatarurl, phone } } } = this.props
+    const {
+      userInfo: {
+        person: { avatarurl, phone }
+      }
+    } = this.props;
 
-    if (avatarurl && avatarurl.indexOf('wx.qlogo.cn') != -1) {
-      console.log(avatarurl, "有头像哦~")
+    if (avatarurl && avatarurl.indexOf("wx.qlogo.cn") != -1) {
+      console.log(avatarurl, "有头像哦~");
       this.setState({
-        avatarVisible: false,
-      })
-      Taro.hideLoading()
-      console.log(phone, "phone#########")
+        avatarVisible: false
+      });
+      Taro.hideLoading();
+      console.log(phone, "phone#########");
       // 头像手机号都有
       if (phone) {
-        this.reportClientFn()
-        this.success()
+        this.reportClientFn();
+        this.success();
         this.setState({
           phoneVisible: false,
-          webViewVisible: true,
-        })
+          webViewVisible: true
+        });
       } else {
         this.setState({
-          phoneVisible: true,
-        })
+          phoneVisible: true
+        });
       }
     } else {
-      Taro.hideLoading()
+      Taro.hideLoading();
       this.setState({
-        avatarVisible: true,
-      })
+        avatarVisible: true
+      });
       if (phone) {
         this.setState({
-          phoneVisible: false,
-        })
+          phoneVisible: false
+        });
       }
     }
   }
 
   componentWillUnmount() {
-    const { recordId } = this.state
-    recordId && updatePoint(recordId)
+    const { recordId } = this.state;
+    recordId && updatePoint(recordId);
   }
 
   // 埋点
   success() {
-    const { codeParams, buildingId } = this.state
-    const firstShare = this.$router.params.firstShare || codeParams.firstShare || ""
-    const consultant = this.$router.params.consultant || codeParams.consultant || ""
-    const sharePersonId = this.$router.params.sharePersonId || codeParams.sharePersonId || ""
-    const h5Id = this.state.h5Id || this.$router.params.id
+    const { codeParams, buildingId } = this.state;
+    const firstShare =
+      this.$router.params.firstShare || codeParams.firstShare || "";
+    const consultant =
+      this.$router.params.consultant || codeParams.consultant || "";
+    const sharePersonId =
+      this.$router.params.sharePersonId || codeParams.sharePersonId || "";
+    const h5Id = this.state.h5Id || this.$router.params.id;
 
     savePoint({
-      event: 'detail',
-      eventType: 'h5',
-      propertyName: 'h5详情',
-      buildingId: buildingId || '',
+      event: "detail",
+      eventType: "h5",
+      propertyName: "h5详情",
+      buildingId: buildingId || "",
       consultantId: consultant,
       sharePersonId: sharePersonId,
       targetId: h5Id,
@@ -150,55 +162,76 @@ export default class Index extends Component {
     }).then(res => {
       this.setState({
         recordId: res.recordId
-      })
-      console.log('访问记录')
-    })
+      });
+      console.log("访问记录");
+    });
   }
 
+  h5ExtendParams = null;
+
+  // H5 分享交互
+  handleMessage = e => {
+    const { data } = e.detail;
+    const { params } =
+      (data || []).reverse().filter(x => x.type === "share")[0] || {};
+
+    console.log("----share message----->", params);
+    if (params) {
+      this.h5ExtendParams = params;
+    }
+  };
+
   // 分享好友
   onShareAppMessage = () => {
-    const { pageInfo, h5Id, buildingId } = this.state
-    const currentPage = `/${this.currentPageAndParams().join('?')}`
-    const { userInfo: { person: { personId, personType, userId } } } = this.props
-    const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : ""
-
-    console.log(currentPage)
-
-    shareSavePoint({
-      event: 'share',
-      eventType: 'activity',
-      targetType: 'h5',
-      propertyName: 'h5详情分享',
-      consultantId: consultantId,
-      sharePersonId: personId,
-      targetId: h5Id,
-      buildingId: buildingId || '',
-      data: '{}'
-    }, 'h5')
-    // savePoint({
-    //   event: 'share',
-    //   eventType: 'h5',
-    //   propertyName: 'h5详情分享',
-    //   consultantId: consultantId,
-    //   sharePersonId: personId,
-    //   targetId: h5Id,
-    //   data: '{}'
-    // }).then(res => {
-    //   console.info('h5详情分享')
-    // })
+    const { pageInfo, h5Id, buildingId } = this.state;
+    const [currentPage, currentParams] = this.currentPageAndParams();
+    const sharePath = `/${currentPage}?${mergeQueryParams(
+      currentParams,
+      this.h5ExtendParams
+    )}`;
+    const {
+      userInfo: {
+        person: { personId, personType, userId }
+      }
+    } = this.props;
+    const consultantId = personType == ROLE_CODE["CONSULTANT"] ? userId : "";
+
+    // 用后即焚
+    this.h5ExtendParams = null;
+
+    console.log("----sharePath----->", sharePath);
+
+    shareSavePoint(
+      {
+        event: "share",
+        eventType: "activity",
+        targetType: "h5",
+        propertyName: "h5详情分享",
+        consultantId: consultantId,
+        sharePersonId: personId,
+        targetId: h5Id,
+        buildingId: buildingId || "",
+        data: "{}"
+      },
+      "h5"
+    );
+
     return {
       title: pageInfo.shareTitle,
-      path: currentPage,
+      path: sharePath,
       imageUrl: pageInfo.shareImg
-    }
-  }
+    };
+  };
 
   currentPageAndParams() {
-    const { userInfo: { person } } = this.props
-    const { h5Id, buildingId } = this.state
+    const {
+      userInfo: { person }
+    } = this.props;
+    const { h5Id, buildingId } = this.state;
 
-    const consultantId = person.personType == ROLE_CODE['CONSULTANT'] ? person.userId : ""
-    const firstShare = this.$router.params.firstShare || person.personId
+    const consultantId =
+      person.personType == ROLE_CODE["CONSULTANT"] ? person.userId : "";
+    const firstShare = this.$router.params.firstShare || person.personId;
 
     let queryParams = [
       `sharePersonId=${person.personId}`,
@@ -209,178 +242,214 @@ export default class Index extends Component {
       `firstShare=${firstShare}`,
       `id=${h5Id}`,
       `buildingId=${buildingId}`
-    ]
+    ];
 
-    const res = [
-      'pages/project/h5Page',
-      queryParams.join('&'),
-    ]
+    const res = ["pages/project/h5Page", queryParams.join("&")];
 
-    return res
+    return res;
   }
 
-
   gotoIndex = () => {
     Taro.switchTab({
-      url: '/pages/project/index'
-    })
-  }
+      url: "/pages/project/index"
+    });
+  };
 
-  loadH5Profile = (id) => {
+  loadH5Profile = id => {
     // h5id 、第一个分享人ID、置业顾问ID、分享人ID
     getHFiveDetail(id).then(res => {
-      Taro.hideLoading()
+      Taro.hideLoading();
       if (res.status == 1) {
         this.setState({
           pageInfo: res,
           h5Id: id,
-          buildingId: res.buildingId || '',
-        })
+          buildingId: res.buildingId || ""
+        });
       } else {
         Taro.showModal({
-          title: '提示',
-          content: '活动已下架',
-          showCancel: false,
+          title: "提示",
+          content: "活动已下架",
+          showCancel: false
         }).then(() => {
-          this.gotoIndex()
-        })
+          this.gotoIndex();
+        });
       }
-    })
-  }
+    });
+  };
 
   // 授权头像成功
   onAvatarSuccess() {
     this.setState({
-      avatarVisible: false,
-
-    })
-    const { userInfo: { person: { phone } } } = this.props
+      avatarVisible: false
+    });
+    const {
+      userInfo: {
+        person: { phone }
+      }
+    } = this.props;
     if (phone) {
       this.setState({
         phoneVisible: false,
-        webViewVisible: true,
-      })
-      this.success()
+        webViewVisible: true
+      });
+      this.success();
     } else {
       this.setState({
-        phoneVisible: true,
-      })
+        phoneVisible: true
+      });
     }
-    console.log("授权头像成功！")
+    console.log("授权头像成功！");
   }
 
   // 授权用户信息
   getUserInfo() {
+    const { dispatchUpdateUserInfo } = this.props;
+    const sessionKey = Taro.getStorageSync("sessionKey");
 
-    const { dispatchUpdateUserInfo } = this.props
-    const sessionKey = Taro.getStorageSync('sessionKey')
-
-    Taro.showLoading()
+    Taro.showLoading();
 
     Taro.getUserInfo({
-      lang: 'zh_CN',
+      lang: "zh_CN",
       success: res => {
-        const payload = Object.assign(res, { sessionKey })
-        console.log(res, "获取用户信息返回值")
+        const payload = Object.assign(res, { sessionKey });
+        console.log(res, "获取用户信息返回值");
         // 用户信息保存至服务器
         dispatchUpdateUserInfo(payload).then(res => {
           this.onAvatarSuccess();
-          console.log('获取用户信息成功')
-          Taro.hideLoading()
-        })
+          console.log("获取用户信息成功");
+          Taro.hideLoading();
+        });
       },
-      fail: (err) => {
-        Taro.hideLoading()
-        console.error(err)
+      fail: err => {
+        Taro.hideLoading();
+        console.error(err);
         this.setState({
-          avatarVisible: true,
-        })
+          avatarVisible: true
+        });
         Taro.showToast({
-          title: '获取用户信息失败',
-          icon: 'none'
-        })
-        return
+          title: "获取用户信息失败",
+          icon: "none"
+        });
+        return;
       }
-    })
+    });
   }
   userInfoClick() {
-    console.log('userInfoClick')
+    console.log("userInfoClick");
     this.setState({
-      avatarVisible: false,
-    })
+      avatarVisible: false
+    });
   }
   // 授权手机号
   getPhoneNumber(e) {
-    const { buildingId, pageInfo } = this.state
-    const loadOptions = wx.getLaunchOptionsSync()
+    const { buildingId, pageInfo } = this.state;
+    const loadOptions = wx.getLaunchOptionsSync();
     const achieveParams = {
-      buildingId: buildingId || '',
-      targetName: pageInfo.name || '',
-      targetType: 'h5',
-      targetId: pageInfo.drainageId || '',
-      promoter: Taro.getStorageSync('recommender'),
+      buildingId: buildingId || "",
+      targetName: pageInfo.name || "",
+      targetType: "h5",
+      targetId: pageInfo.drainageId || "",
+      promoter: Taro.getStorageSync("recommender"),
       sceneId: loadOptions.scene
-    }
-    console.log(achieveParams, "achieveParamsachieveParamsachieveParamsachieveParams")
-    getUserPhone(e, achieveParams, (phoneNumber) => {
+    };
+    console.log(
+      achieveParams,
+      "achieveParamsachieveParamsachieveParamsachieveParams"
+    );
+    getUserPhone(e, achieveParams, phoneNumber => {
       if (!phoneNumber) {
         Taro.showToast({
-          title: '获取手机号失败',
-          icon: 'none'
-        })
+          title: "获取手机号失败",
+          icon: "none"
+        });
       } else {
-        ruleToast('signup-agent')
+        ruleToast("signup-agent");
         setTimeout(() => {
-          this.success()
-          this.reportClientFn()
+          this.success();
+          this.reportClientFn();
           this.setState({
             phoneVisible: false,
-            webViewVisible: true,
-          })
-        }, 1000)
+            webViewVisible: true
+          });
+        }, 1000);
       }
-    })
+    });
   }
   // 报备客户
   reportClientFn() {
-    const { codeParams } = this.state
-    const consultant = this.$router.params.consultant || codeParams.consultant || ""
-    const { userInfo: { person } } = this.props
+    const { codeParams } = this.state;
+    const consultant =
+      this.$router.params.consultant || codeParams.consultant || "";
+    const {
+      userInfo: { person }
+    } = this.props;
 
     if (!this.state.reportedCustomer) {
       reportCustomer(person, consultant).then(() => {
-        this.setState({ reportedCustomer: true })
-      })
+        this.setState({ reportedCustomer: true });
+      });
     }
   }
 
   renderMaskBanner() {
-    const { avatarVisible, phoneVisible, pageInfo, h5Id } = this.state
+    const { avatarVisible, phoneVisible, pageInfo, h5Id } = this.state;
     return (
       <View>
-        <Image src={pageInfo.middleImg || bgImg} mode='widthFix' className='bg_img'></Image>
+        <Image
+          src={pageInfo.middleImg || bgImg}
+          mode="widthFix"
+          className="bg_img"
+        ></Image>
         <View className="middle-page">
-          {avatarVisible && h5Id &&
+          {avatarVisible && h5Id && (
             <View className="content">
               <View className="title">授权头像，围观活动</View>
-              <View className="touxiang"><open-data type="userAvatarUrl"></open-data></View>
-              <View className="name"><open-data type="userNickName"></open-data></View>
-              <Button className="btn" open-type="getUserInfo" lang="zh_CN" onClick={this.userInfoClick} onGetUserInfo={this.getUserInfo}>好</Button>
+              <View className="touxiang">
+                <open-data type="userAvatarUrl"></open-data>
+              </View>
+              <View className="name">
+                <open-data type="userNickName"></open-data>
+              </View>
+              <Button
+                className="btn"
+                open-type="getUserInfo"
+                lang="zh_CN"
+                onClick={this.userInfoClick}
+                onGetUserInfo={this.getUserInfo}
+              >
+                好
+              </Button>
             </View>
-          }
-          {phoneVisible && h5Id &&
-            <Button className="phone-btn" open-type="getPhoneNumber" lang="zh_CN" onGetphonenumber={this.getPhoneNumber}>点击授权查看详情</Button>
-          }
+          )}
+          {phoneVisible && h5Id && (
+            <Button
+              className="phone-btn"
+              open-type="getPhoneNumber"
+              lang="zh_CN"
+              onGetphonenumber={this.getPhoneNumber}
+            >
+              点击授权查看详情
+            </Button>
+          )}
         </View>
       </View>
-    )
+    );
   }
   render() {
-
-    const { pageInfo, webViewVisible, codeParams, pageHide, h5Id, buildingId } = this.state
-    const { userInfo: { person } } = this.props
-    const consultant = person.personType == ROLE_CODE['CONSULTANT'] ? person.userId : ""
-    const firstShare = this.$router.params.firstShare || person.personId
+    const {
+      pageInfo,
+      webViewVisible,
+      codeParams,
+      pageHide,
+      h5Id,
+      buildingId
+    } = this.state;
+    const {
+      userInfo: { person }
+    } = this.props;
+    const consultant =
+      person.personType == ROLE_CODE["CONSULTANT"] ? person.userId : "";
+    const firstShare = this.$router.params.firstShare || person.personId;
     const webUrlParams = [
       `personId=${person.personId}`,
       `recommender=${person.personId}`,
@@ -388,20 +457,30 @@ export default class Index extends Component {
       `buildingId=${buildingId}`,
       `consultant=${consultant}`,
       `firstShare=${firstShare}`,
-      `codeParams=${encodeURIComponent(codeParams['__raw'])}`,
-    ].join('&')
-
-    const showH5 = !isEmpty(h5Id) && pageInfo.h5Address && pageInfo.h5Address !== 'about' && pageInfo.h5Address !== 'http://about' && pageInfo.h5Address !== 'https://about'
-
-    const originURL = parseURL(pageInfo.h5Address) || {}
-    const queryString = [webUrlParams, originURL.query].join('&')
-    const webURL = [`${originURL.origin}${originURL.path}?${queryString}`, originURL.hash].join('#')
+      `codeParams=${encodeURIComponent(codeParams["__raw"])}`
+    ].join("&");
+
+    const showH5 =
+      !isEmpty(h5Id) &&
+      pageInfo.h5Address &&
+      pageInfo.h5Address !== "about" &&
+      pageInfo.h5Address !== "http://about" &&
+      pageInfo.h5Address !== "https://about";
+
+    const originURL = parseURL(pageInfo.h5Address) || {};
+    const queryString = [webUrlParams, originURL.query].join("&");
+    const webURL = [
+      `${originURL.origin}${originURL.path}?${queryString}`,
+      originURL.hash
+    ].join("#");
 
     return (
       <Block>
         {this.renderMaskBanner()}
-        {webViewVisible && showH5 && <WebView src={webURL} />}
+        {webViewVisible && showH5 && (
+          <WebView src={webURL} onMessage={this.handleMessage} />
+        )}
       </Block>
-    )
+    );
   }
 }

src/reducers/system.js

@@ -1,4 +1,4 @@
-import { UPDATE_PRELOAD, SYNC_SYSTEMINFO } from '@/constants/common'
+import { UPDATE_PRELOAD, SYNC_SYSTEMINFO } from "@/constants/common";
 
 // 初始数据
 const INITIAL_STATE = {
@@ -7,25 +7,25 @@ const INITIAL_STATE = {
   orgInfo: {},
   userInfo: {},
   settings: [],
-  systemInfo: {},
-}
+  systemInfo: {}
+};
 
-export default function (state = INITIAL_STATE, action) {
+export default function(state = INITIAL_STATE, action) {
   switch (action.type) {
     case UPDATE_PRELOAD: {
       return {
         ...state,
-        ...action.payload,
-      }
+        ...action.payload
+      };
     }
     case SYNC_SYSTEMINFO: {
       return {
         ...state,
-        systemInfo: action.payload,
-      }
+        systemInfo: action.payload
+      };
     }
 
     default:
-      return state
+      return state;
   }
 }

src/utils/tools.js

@@ -176,7 +176,7 @@ export function parseURL(url) {
   }
 
   // 小程序只支持 https 开头
-  const [_, origin, path] = /(https:\/\/[^/]+)(.*)/.exec(strTmp);
+  const [_, origin, path] = /(https?:\/\/[^/]+)(.*)/.exec(strTmp);
 
   return {
     origin,
@@ -214,6 +214,23 @@ export function parseQueryString(queryString) {
     }, {});
 }
 
+/**
+ *
+ * @param {*} url
+ * @param {*} params
+ */
+export function mergeQueryParams(from, to) {
+  const originParams = parseQueryString(from) || {};
+  const newParams = {
+    ...originParams,
+    ...(parseQueryString(to) || {})
+  };
+
+  return Object.keys(newParams)
+    .map(key => `${key}=${newParams[key]}`)
+    .join("&");
+}
+
 /**
  * 格式化剩余时间为 xx天xx小时xx分xx秒
  * @param {int} leftTime 时间毫秒数