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

config/dev.js

@@ -15,11 +15,11 @@ module.exports = {
     // WSS_HOST: '"wss://wx.fangdeal.cn"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
-    // HOST: '"http://192.168.2.52:8080"',
-    // WSS_HOST: '"ws://192.168.2.52:8080"',
+    // HOST: '"http://192.168.2.42:8080"',
+    // WSS_HOST: '"ws://192.168.2.42:8080"',
     OSS_PATH: 'https://njcj.oss-cn-shanghai.aliyuncs.com/',
     OSS_FAST_PATH: 'https://njcj.oss-accelerate.aliyuncs.com/',
-    Version: 'V3.5.19'
+    Version: 'V3.5.22'
   },
   weapp: {},
   h5: {}

config/index.js

@@ -1,5 +1,6 @@
 
 const path = require('path')
+
 const sassImportor = function (url) {
   const reg = /^@\/styles\/(.*)/
   return {
@@ -27,7 +28,7 @@ const config = {
         }]
       ],
       plugins: [
-        'transform-decorators-legacy',
+        ['preval', ['transform-decorators-legacy']],
         'transform-class-properties',
         'transform-object-rest-spread'
       ]

config/prod.js

@@ -7,15 +7,15 @@ module.exports = {
     // WSS_HOST: '"ws://192.168.2.52:8080"',
     // HOST: '"https://dev.pawoma.cn"',// 新测试
     // WSS_HOST: '"wss://dev.pawoma.cn"',
-    // HOST: '"https://dev.fangdeal.cn"',//测试
-    // WSS_HOST: '"wss://dev.fangdeal.cn"',
-    HOST: '"https://wx.fangdeal.cn"',//正式
-    WSS_HOST: '"wss://wx.fangdeal.cn"',
+    HOST: '"https://dev.fangdeal.cn"',//测试
+    WSS_HOST: '"wss://dev.fangdeal.cn"',
+    // HOST: '"https://wx.fangdeal.cn"',//正式
+    // WSS_HOST: '"wss://wx.fangdeal.cn"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
     OSS_PATH: 'https://njcj.oss-cn-shanghai.aliyuncs.com/',
     OSS_FAST_PATH: 'https://njcj.oss-accelerate.aliyuncs.com/',
-    Version: 'V3.5.19'
+    Version: 'V3.5.22'
   },
   weapp: {},
   h5: {}

config/routes.js

@@ -0,0 +1,567 @@
+
+const routes = [
+
+  /**********************************
+   *  Tab 页面
+   *********************************/
+
+  {
+    name: '首页',
+    page: 'pages/project/index',
+    pgk: 'main',
+    isTab: true,
+    type: '',
+  },
+  {
+    name: '积分商城',
+    page: 'pages/shop/index',
+    pgk: 'main',
+    isTab: true,
+    type: '',
+  },
+  {
+    name: '活动资讯',
+    page: 'pages/activity/activity',
+    pgk: 'main',
+    isTab: true,
+    type: '',
+  },
+  {
+    name: '个人中心',
+    page: 'pages/person/index',
+    pgk: 'main',
+    isTab: true,
+    type: '',
+  },
+
+  /********************************
+   * 项目相关
+   *******************************/
+  {
+    name: '项目列表',
+    page: 'pages/project/list/index',
+    pgk: 'main',
+    type: '',
+  },
+  {
+    name: '地图看房',
+    page: 'pages/project/map/index',
+    pgk: 'main',
+    type: '',
+  },
+  {
+    name: '项目详情',
+    page: 'pages/project/detail/index',
+    pgk: 'main',
+    type: '',
+  },
+  {
+    name: '项目亮点',
+    page: 'pages/project/detail/highLight',
+    pgk: 'main',
+    type: '',
+  },
+  {
+    name: '楼盘周边',
+    page: 'pages/project/detail/map',
+    pgk: 'main',
+    type: '',
+  },
+  {
+    name: '楼盘信息',
+    page: 'pages/project/floor/index',
+    pgk: 'main',
+    type: '',
+  },
+  {
+    name: '项目相册',
+    page: 'pages/project/album/index',
+    pgk: 'main',
+    type: '',
+  },
+
+
+  /**************************************
+   * 商城相关
+   *************************************/
+  {
+    name: '积分规则',
+    page: 'pages/shop/rule/index',
+    pgk: 'main',
+    type: '',
+  },
+  {
+    name: '积分明细',
+    page: 'pages/shop/integralDetail/index',
+    pgk: 'main',
+    type: '',
+  },
+  {
+    name: '商品详情',
+    page: 'pages/shop/detail/index',
+    pgk: 'main',
+    type: '',
+  },
+
+
+  /************************************
+   * 个人中心
+   ***********************************/
+  {
+    name: '登录',
+    page: 'pages/person/login/index',
+    pgk: 'main',
+    type: '',
+  },
+  {
+    name: '我的分享',
+    page: 'pages/person/myShare/index',
+    pgk: 'main',
+    type: '',
+  },
+  {
+    name: '我的活动',
+    page: 'pages/activity/myActivity',
+    pgk: 'main',
+    type: '',
+  },
+  {
+    name: '我的拼团',
+    page: 'pages/activity/assemblePage',
+    pgk: 'main',
+    type: '',
+  },
+  {
+    name: '我的助力',
+    page: 'pages/activity/assistancePage',
+    pgk: 'main',
+    type: '',
+  },
+  {
+    name: '我的推广码',
+    page: 'pages/person/spread/index',
+    pgk: 'main',
+    type: '',
+  },
+  {
+    name: '我的卡片',
+    page: 'pages/card/index',
+    pgk: 'main',
+    type: '',
+  },
+  {
+    name: '我的客户',
+    page: 'pages/person/myGuest/index',
+    pgk: 'main',
+    type: '',
+  },
+  {
+    name: '我的收藏',
+    page: 'pages/person/favorite/index',
+    pgk: 'main',
+    type: '',
+  },
+  {
+    name: '个人资料',
+    page: 'pages/person/personDetail/index',
+    pgk: 'main',
+    type: '',
+  },
+  {
+    name: '编辑资料',
+    page: 'pages/person/personDetail/editDetail/index',
+    pgk: 'main',
+    type: '',
+  },
+  {
+    name: '每日签到',
+    page: 'pages/signin/index',
+    pgk: 'main',
+    type: '',
+  },
+
+
+  /****************************************
+   * 置业相关
+   ***************************************/
+  {
+    name: '置业列表',
+    page: 'pages/card/list/index',
+    pgk: 'main',
+    type: '',
+  },
+  {
+    name: '置业绑定',
+    page: 'pages/card/register/index',
+    pgk: 'main',
+    type: '',
+  },
+  {
+    name: '咨询列表',
+    page: 'pages/im/list/index',
+    pgk: 'main',
+    type: '',
+  },
+  {
+    name: '聊天咨询',
+    page: 'pages/im/index',
+    pgk: 'main',
+    type: '',
+  },
+  {
+    name: '卡片围观记录',
+    page: 'pages/card/fans/index',
+    pgk: 'main',
+    type: '',    
+  },
+
+  /***********************************
+   * 客户相关
+   **********************************/
+  {
+    name: '访客信息',
+    page: 'pages/person/myShare/accessRecord',
+    pgk: 'main',
+    type: '',
+  },
+  {
+    name: '客户详情',
+    page: 'pages/person/myGuest/editGuest/index',
+    pgk: 'main',
+    type: '',
+  },
+  {
+    name: '报备客户',
+    page: 'pages/report/index',
+    pgk: 'main',
+    type: '',
+  },
+  {
+    name: '报备授权',
+    page: 'pages/report/login/index',
+    pgk: 'main',
+    type: '',
+  },
+  {
+    name: '报备详情',
+    page: 'pages/report/detail/index',
+    pgk: 'main',
+    type: '',
+  },
+
+
+  /************************************
+   * 活动资讯
+   ***********************************/
+  {
+    name: 'H5',
+    page: 'pages/project/h5Page',
+    pgk: 'main',
+    type: '',
+  },
+  {
+    name: '活动详情',
+    page: 'pages/activity/detail/index',
+    pgk: 'main',
+    type: '',
+  },
+  {
+    name: '助力详情',
+    page: 'pages/activity/detail/assistance',
+    pgk: 'main',
+    type: '',
+  },
+  {
+    name: '拼团详情',
+    page: 'pages/activity/detail/assemble',
+    pgk: 'main',
+    type: '',
+  },
+  {
+    name: '资讯详情',
+    page: 'pages/news/detail/index',
+    pgk: 'main',
+    type: '',
+  },
+  {
+    name: '签到',
+    page: 'pages/checkin/index',
+    pgk: 'main',
+    type: '',
+  },
+  {
+    name: '签到结果',
+    page: 'pages/checkin/checkinsuccess/index',
+    pgk: 'main',
+    type: '',
+  },
+
+  /*****************************************
+   * 其他
+   ****************************************/
+  {
+    name: '授权',
+    page: 'pages/person/authorize/index',
+    pgk: 'main',
+    type: '',
+  },
+  {
+    name: '授权',
+    page: 'pages/auth/index',
+    pgk: 'main',
+    type: '',
+  },
+  {
+    name: '购房政策列表',
+    page: 'pages/policy/index',
+    pgk: 'main',
+    type: '',
+  },
+  {
+    name: '购房政策详情',
+    page: 'pages/policy/detail/index',
+    pgk: 'main',
+    type: '',
+  },
+  {
+    name: '房贷计算器',
+    page: 'pages/toolKit/index',
+    pgk: 'main',
+    type: '',
+  },
+  {
+    name: '房贷计算结果',
+    page: 'pages/toolKit/calculateResult/index',
+    pgk: 'main',
+    type: '',
+  },
+  {
+    name: '城市列表',
+    page: 'pages/city/index',
+    pgk: 'main',
+    type: '',
+  },
+  {
+    name: '外链容器页',
+    page: 'pages/project/panorama/index',
+    pgk: 'main',
+    type: '',
+  },
+
+  /**
+   * 子包: 在线购房
+   */
+  {
+    name: '房源列表',
+    page: 'pages/houseList/index',
+    pgk: 'onlineSelling',
+    type: '',
+  },
+  {
+    name: '认筹流程',
+    page: 'pages/raiseMoney/index',
+    pgk: 'onlineSelling',
+    type: '',
+  },
+  {
+    name: '合同签署结果',
+    page: 'pages/raiseMoney/signResult',
+    pgk: 'onlineSelling',
+    type: '',
+  },
+  {
+    name: '实名认证',
+    page: 'pages/raiseMoney/Certification',
+    pgk: 'onlineSelling',
+    type: '',
+  },
+  {
+    name: '直播详情',
+    page: 'pages/live/index',
+    pgk: 'onlineSelling',
+    type: '',
+  },
+  {
+    name: '选房帮助',
+    page: 'pages/help/index',
+    pgk: 'onlineSelling',
+    type: '',
+  },
+  {
+    name: '选房记录',
+    page: 'pages/records/index',
+    pgk: 'onlineSelling',
+    type: '',
+  },
+  {
+    name: '房源详情',
+    page: 'pages/detail/index',
+    pgk: 'onlineSelling',
+    type: '',
+  },
+  {
+    name: '预选结果',
+    page: 'pages/detail/resultPage',
+    pgk: 'onlineSelling',
+    type: '',
+  },
+  {
+    name: '筛选房源',
+    page: 'pages/screenHouse/index',
+    pgk: 'onlineSelling',
+    type: '',
+  },
+  {
+    name: '选择置业',
+    page: 'pages/chooseConsultant/index',
+    pgk: 'onlineSelling',
+    type: '',
+  },
+  {
+    name: '认筹协议',
+    page: 'pages/protocol/index',
+    pgk: 'onlineSelling',
+    type: '',
+  },
+  {
+    name: '认筹单',
+    page: 'pages/raiseProfile/index',
+    pgk: 'onlineSelling',
+    type: '',
+  },
+  {
+    name: '房源清单',
+    page: 'pages/raiseProfile/houseResource',
+    pgk: 'onlineSelling',
+    type: '',
+  },
+  {
+    name: '添加预选房源',
+    page: 'pages/addHouse/index',
+    pgk: 'onlineSelling',
+    type: '',
+  },
+  {
+    name: '添加其他房源',
+    page: 'pages/houseCart/index',
+    pgk: 'onlineSelling',
+    type: '',
+  },
+
+
+  /**
+   * 子包: 不常用功能
+   */
+  {
+    name: '盘客工具',
+    page: 'pages/person/customerAnalysis/index',
+    pgk: 'useless',
+    type: '',
+  },
+  {
+    name: '我的客户',   // 置业-我的客户
+    page: 'pages/person/customerAnalysis/myCustomer',
+    pgk: 'useless',
+    type: '',
+  },
+  {
+    name: '客户分析',
+    page: 'pages/person/customerAnalysis/analysis',
+    pgk: 'useless',
+    type: '',
+  },
+  {
+    name: '我的资料',
+    page: 'pages/person/profile/index',
+    pgk: 'useless',
+    type: '',
+  },
+  {
+    name: '资料审核',
+    page: 'pages/person/profile/detail/index',
+    pgk: 'useless',
+    type: '',
+  },
+  {
+    name: '我的主页',
+    page: 'pages/agent/index',
+    pgk: 'useless',
+    type: '',
+  },
+  {
+    name: '成为经纪人',
+    page: 'pages/agent/become/index',
+    pgk: 'useless',
+    type: '',
+  },
+  {
+    name: '推荐客户',
+    page: 'pages/agent/recommend/index',
+    pgk: 'useless',
+    type: '',
+  },
+  {
+    name: '我的客户',   // 经纪人-我的客户
+    page: 'pages/agent/client/index',
+    pgk: 'useless',
+    type: '',
+  },
+  {
+    name: '客户审核进度',
+    page: 'pages/agent/progress/index',
+    pgk: 'useless',
+    type: '',
+  },
+  {
+    name: '意见反馈',
+    page: 'pages/person/feedback/index',
+    pgk: 'useless',
+    type: '',
+  },
+  {
+    name: '积分兑换记录',
+    page: 'pages/shop/record/index',
+    pgk: 'useless',
+    type: '',
+  },
+  // {
+  //   name: '我的邀请',
+  //   page: 'pages/agent/invitation/index',
+  //   pgk: 'useless',
+  //   type: '',
+  // },
+
+]
+
+
+/**
+ * 获取 app pages 列表
+ */
+function getPages() {
+  const grp = routes.reduce((g, r) => {
+    const { pgk, page } = r
+    const pg = g[pgk] || []
+    
+    return {
+      ...g,
+      [`${pgk}`]: pg.concat(page),
+    }
+  }, {});
+
+  const { main, ...pkgs } = grp
+
+  return {
+    pages: main,
+    subPackages: Object.keys(pkgs).map((name) => {
+      return {
+        root: name,
+        pages: pkgs[name]
+      }
+    })
+  }
+}
+
+export {
+  routes,
+  getPages,
+}

ext.json

@@ -1,5 +1,5 @@
 {
   "extEnable": true,
-  "extAppid": "wxda1f84b79b3edeb3",
+  "extAppid": "wxd9ee3a9480a4e544",
   "ext": {}
 }

package.json

@@ -36,6 +36,7 @@
     "@types/react": "^16.4.6",
     "@types/webpack-env": "^1.13.6",
     "babel-eslint": "^8.2.3",
+    "babel-plugin-preval": "^5.0.0",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-plugin-transform-decorators-legacy": "^1.3.4",
     "babel-plugin-transform-jsx-stylesheet": "^0.6.5",

project.config.json

@@ -2,7 +2,7 @@
 	"miniprogramRoot": "dist/",
 	"projectname": "mini-chengjiao",
 	"description": "知与行互动",
-	"appid": "wxd9ee3a9480a4e544",
+	"appid": "wxbbb069a341055ef0",
 	"setting": {
 		"urlCheck": false,
 		"es6": false,

src/app.js

@@ -53,103 +53,18 @@ class App extends Component {
       "wxc4f812079fc9ff0d",
       "wx60d176f873ca2d67",
     ],
-    pages: [
-      'pages/project/index',
-      'pages/project/h5Page',
-      'pages/project/detail/map',
-      'pages/person/myShare/accessRecord',
-      'pages/person/myShare/index',
-      'pages/shop/index',
-      'pages/activity/activity',
-      'pages/activity/myActivity',
-      'pages/person/index',
-      'pages/project/detail/index',
-      'pages/project/detail/highLight',
-      'pages/activity/assemblePage',
-      'pages/activity/assistancePage',
-      'pages/person/spread/index',
-      'pages/card/index',
-      'pages/im/list/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/integralDetail/index',
-      'pages/auth/index',
-      'pages/card/list/index',
-      'pages/report/index',
-      'pages/project/list/index',
-      'pages/report/login/index',
-      'pages/project/floor/index',
-      'pages/im/index',
-      'pages/activity/detail/index',
-      'pages/activity/detail/assistance',
-      'pages/activity/detail/assemble',
-      'pages/news/detail/index',
-      'pages/card/register/index',
-      'pages/report/detail/index',
-      'pages/policy/index',
-      'pages/policy/detail/index',
-      'pages/toolKit/index',
-      'pages/toolKit/calculateResult/index',
-      'pages/project/album/index',
-      'pages/person/favorite/index',
-      'pages/city/index',
-      'pages/shop/detail/index',
-      'pages/signin/index',
-      'pages/card/fans/index',
-      'pages/checkin/index',
-      'pages/checkin/checkinsuccess/index',
-      'pages/project/panorama/index',
-    ],
-    subPackages: [
-      {
-        root: "useless",
-        pages: [
-          'pages/person/customerAnalysis/index',
-          'pages/person/customerAnalysis/myCustomer',
-          'pages/person/customerAnalysis/analysis',
-          'pages/person/profile/index',
-          'pages/person/profile/detail/index',
-          'pages/agent/index',
-          'pages/agent/become/index',
-          // 'pages/agent/invitation/index',
-          'pages/agent/recommend/index',
-          'pages/agent/client/index',
-          'pages/agent/progress/index',
-          'pages/person/feedback/index',
-          'pages/shop/record/index',
-        ],
-      },
-      {
-        root: "onlineSelling",
-        pages: [
-          'pages/houseList/index',
-          'pages/raiseMoney/index',
-          'pages/raiseMoney/signResult',
-          'pages/raiseMoney/Certification',
-          'pages/live/index',
-          'pages/help/index',
-          'pages/records/index',
-          'pages/detail/index',
-          'pages/detail/resultPage',
-          'pages/screenHouse/index',
-          'pages/chooseConsultant/index',
-          'pages/protocol/index',
-          'pages/raiseProfile/index',
-          'pages/raiseProfile/houseResource',
-          'pages/addHouse/index',
-          'pages/houseCart/index',
-        ],
-      }
-    ],
+    // eslint-disable-next-line no-undef
+    pages: preval`
+      const {getPages} = require('./src/routes.js')
+      module.exports = getPages().pages
+    `,
+    // eslint-disable-next-line no-undef
+    subPackages: preval`
+      const {getPages} = require('./src/routes.js')
+      module.exports = getPages().subPackages
+    `,
     window: {
       backgroundTextStyle: 'light',
-      // navigationBarBackgroundColor: '#E31F05',
       navigationBarBackgroundColor: '#BB9C79',
       navigationBarTitleText: '',
       navigationBarTextStyle: 'white',
@@ -225,8 +140,6 @@ class App extends Component {
     socket.reconnect()
 
     this.initData()
-
-
   }
 
   componentDidMount() {
@@ -317,6 +230,8 @@ class App extends Component {
           Taro.removeStorageSync('buildingPageIndex')
           Taro.removeStorageSync('followPageIndex')
           Taro.removeStorageSync('clinchPageIndex')
+          // 获取分享人
+          Taro.setStorageSync('recommender', payload.recommender)
 
           // 获取未读消息
           const { person: { personId } } = res

src/components/achievePhone/index.js

@@ -18,7 +18,8 @@ export default class Index extends Component {
 
   }
   getPhoneNumber(e) {
-    getUserPhone(e, { buildingId: this.props.buildingId }, (phoneNumber) => {
+    const loadOptions = wx.getLaunchOptionsSync()
+    getUserPhone(e, { ...this.props.achieveParams, promoter: Taro.getStorageSync('recommender'), sceneId: loadOptions.scene }, (phoneNumber) => {
       if (!phoneNumber) {
         Taro.showToast({
           title: '获取手机号失败',

src/components/authorize/index.js

@@ -19,7 +19,8 @@ export default class Index extends Component {
   }
 
   getPhoneNumber(e) {
-    getUserPhone(e, { buildingId: '' }, (phoneNumber) => {
+    const loadOptions = wx.getLaunchOptionsSync()
+    getUserPhone(e, { ...this.props.achieveParams, promoter: Taro.getStorageSync('recommender'), sceneId: loadOptions.scene, buildingId: '' }, (phoneNumber) => {
       if (!phoneNumber) {
         Taro.showToast({
           title: '获取手机号失败',

src/onlineSelling/components/GrantProfile/index.js

@@ -27,7 +27,7 @@ export default function GrantProfile(props) {
     <Block>
       {
         grantPhone &&
-        (<AchievePhone user={props.person} buildingId={props.buildingId} onSuccess={noop}></AchievePhone>)
+        (<AchievePhone user={props.person} buildingId={props.buildingId} achieveParams={props.achieveParams} onSuccess={noop}></AchievePhone>)
       }
 
       {

src/onlineSelling/pages/detail/index.js

@@ -189,12 +189,18 @@ export default class Index extends Component {
     const { taRaise } = this.state.houseDetail
     const { userInfo } = this.props
     const address = `${houseDetail.buildingName || ''}${houseDetail.termName || ''}${houseDetail.blockName || ''}${houseDetail.unitName || ''}${houseDetail.floorName || ''}${houseDetail.roomName || ''}`
-
+    const achieveParams = {
+      buildingId: houseDetail.buildingId || '',
+      targetName: houseDetail.apartmentName || '',
+      targetType: 'other',
+      targetId: houseDetail.houseId || '',
+    }
+    console.log(achieveParams, "achieveParamsachieveParamsachieveParamsachieveParams")
     return (
       <Block>
         {
           grantPhoneVisible &&
-          <AchievePhone user={userInfo.person} onSuccess={this.toggleGrantAvatar} buildingId={houseDetail.buildingId || ''}></AchievePhone>
+          <AchievePhone user={userInfo.person} onSuccess={this.toggleGrantAvatar} achieveParams={achieveParams} buildingId={houseDetail.buildingId || ''}></AchievePhone>
         }
         {
           grantAvatarVisible &&

src/onlineSelling/pages/houseList/index.js

@@ -638,6 +638,7 @@ export default class HouseList extends Component {
       dataType
     } = this.state
     const buildingIdProps = this.$router.params.buildingId || buildingId
+    const salesBatchId = this.$router.params.id || this.state.id
 
     if (loading) {
       return <View style="margin: 80px auto;"><Loading color="#BB9C79" size={100} /></View>
@@ -650,17 +651,24 @@ export default class HouseList extends Component {
     console.log('==============>', posterData, showPoster, posterConfig)
 
     const screenList = [{ title: '预选热度图', value: 1 }, { title: '认筹热度图', value: 2 }]
+    const achieveParams = {
+      buildingId: salesBatchDetail.buildingId || buildingIdProps || '',
+      targetName: salesBatchDetail.salesBatchName || '',
+      targetType: 'house',
+      targetId: salesBatchDetail.salesBatchId || salesBatchId || '',
+    }
+    console.log(achieveParams, "achieveParamsachieveParamsachieveParamsachieveParams")
     return (
       <Block>
         {conditionVisible && this.renderCondition()}
         {/* 授权电话与头像 */}
-        <GrantProfile both person={person} buildingId={buildingIdProps || ''} />
+        <GrantProfile both person={person} achieveParams={achieveParams} buildingId={buildingIdProps || ''} />
         {/* 置业顾问悬框 */}
         {
           consultShow && <Consultant style="bottom:150rpx" smallStyle="bottom:178rpx" personId={person.personId} name={person.name || person.nickname} data={consultData}></Consultant>
         }
         {/* 生成海报 */}
-        {showPoster && <Poster data={posterData} configs={posterConfig} onCancel={this.togglePosterStatus} onFinish={this.togglePosterStatus} ></Poster>}
+        {showPoster && <Poster data={posterData} configs={posterConfig} onCancel={() => this.setState({ showPoster: false, showShareMenu: false })} onFinish={this.togglePosterStatus} ></Poster>}
         {!noRecord ?
           <Block>
             {!conditionVisible && <Block>

src/onlineSelling/pages/houseList/poster.js

@@ -34,7 +34,7 @@ export default class Index extends Component {
   }
   initConfig() {
     const { data } = this.props
-    console.log(data,"datadatadatadatadatadatadatadatadatadatadatadatadatadata")
+    console.log(data, "datadatadatadatadatadatadatadatadatadatadatadatadatadata")
     const { basicConfig } = this.state
     // const texts = [
     //   {
@@ -78,7 +78,7 @@ export default class Index extends Component {
         zIndex: 1
       }
     ]
-    const configs = Object.assign(basicConfig, { images, blocks})
+    const configs = Object.assign(basicConfig, { images, blocks })
     this.setState({
       configs,
       canvasStatus: true
@@ -123,6 +123,12 @@ export default class Index extends Component {
     Taro.hideLoading();
     this.props.toggle(false)
   }
+  onCancel = () => {
+    Taro.hideLoading();
+    if (typeof this.props.onCancel === 'function') {
+      this.props.onCancel()
+    }
+  }
 
   // 保存图片至本地
   saveToAlbum = (e) => {
@@ -167,7 +173,7 @@ export default class Index extends Component {
               <View className="con">
                 <View className="con-head">
                   <Text>保存后分享图片</Text>
-                  <Text className="iconfont icon-buoumaotubiao20" onClick={this.hidePoster}></Text>
+                  <Text className="iconfont icon-buoumaotubiao20" onClick={this.onCancel}></Text>
                 </View>
                 <View className="con-body">
                   <Image className="result-img" mode="aspectFit" lazy-load src={this.state.shareImage} onClick={this.onPreview}></Image>

src/onlineSelling/pages/live/index.js

@@ -21,15 +21,15 @@ import './index.scss'
 const bgImg = "https://njcj.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/bg.png"
 
 @connect(s => s.user)
-@withDetail({
-  track: {
-    event: 'detail',
-    eventType: 'activity',
-    targetType: 'live',
-    propertyName: '查看直播详情页',
-    data: '{}',
-  }
-})
+// @withDetail({
+//   track: {
+//     event: 'detail',
+//     eventType: 'activity',
+//     targetType: 'live',
+//     propertyName: '查看直播详情页',
+//     data: '{}',
+//   }
+// })
 export default class livePage extends Component {
   config = {
     navigationBarTitleText: '直播活动详情',
@@ -46,6 +46,7 @@ export default class livePage extends Component {
     consultData: {}, // 分享的置业顾问信息
     consultShow: false,  // 置业顾问悬浮框显示隐藏
     noRecord: false,
+    recordId: undefined, // 埋点ID
   }
 
 
@@ -102,6 +103,10 @@ export default class livePage extends Component {
     this._$_dataReady()
   }
 
+  componentWillUnmount() {
+    const { recordId } = this.state
+    recordId && updatePoint(recordId)
+  }
 
   anotherInfo(id) {
 
@@ -124,6 +129,19 @@ export default class livePage extends Component {
         liveDetail: res || {},
         noRecord: res.status == '1' ? false : true
       })
+      savePoint({
+        event: 'detail',
+        eventType: 'activity',
+        targetType: 'live',
+        targetId: res.liveActivityId,
+        propertyName: '查看直播详情页',
+        data: '{}',
+      }).then(res => {
+        this.setState({
+          recordId: res.recordId
+        })
+        console.log('直播详情页')
+      })
       Taro.hideToast()
       const { templates = [], posterImg = '' } = (res.posters || [])[0]
 
@@ -254,6 +272,7 @@ export default class livePage extends Component {
       })
     }
   }
+
   getPosterData = () => {
     return new Promise(resolve => {
       const { posterData } = this.state
@@ -320,16 +339,23 @@ export default class livePage extends Component {
     const { userInfo: { person } } = this.props
     const showCircleBtn = posterData && posterData.qrcode
     console.log('==============>', posterData, showPoster, posterConfig)
+    const achieveParams = {
+      buildingId: liveDetail.buildingId || '',
+      targetName: liveDetail.liveActivityTitle || '',
+      targetType: 'live',
+      targetId: liveDetail.liveActivityId || '',
+    }
+    console.log(achieveParams, "achieveParamsachieveParamsachieveParamsachieveParamsachieveParams")
     return (
       <Block>
         {/* 授权电话与头像 */}
-        <GrantProfile both person={person} buildingId={liveDetail.buildingId || ''} />
+        <GrantProfile both person={person} achieveParams={achieveParams} buildingId={liveDetail.buildingId || ''} />
         {/* 置业顾问悬框 */}
         {
           consultShow && <Consultant style="bottom:150rpx" smallStyle="bottom:178rpx" personId={person.personId} name={person.name || person.nickname} data={consultData}></Consultant>
         }
         {/* 生成海报 */}
-        {showPoster && <Poster data={posterData} configs={posterConfig} onCancel={this.togglePosterStatus} onFinish={this.togglePosterStatus} ></Poster>}
+        {showPoster && <Poster data={posterData} configs={posterConfig} onCancel={() => this.setState({ showPoster: false, showShareMenu: false })} onFinish={() => this.setState({ showPoster: false, showShareMenu: false })} ></Poster>}
         {!noRecord ?
           <View className="live-page">
             <Image onClick={this.handleLiveBtn} src={transferImage(liveDetail.detailTypeImg || bgImg)} mode='widthFix' className="bg_img"></Image>

src/pages/activity/activity.js

@@ -62,7 +62,13 @@ export default class active extends Component {
   }
 
   renderLogin() {
-    return <Authorize from="pages/activity/activity"></Authorize>
+    const achieveParams = {
+      buildingId: '',
+      targetName: '活动资讯',
+      targetType: 'other',
+      targetId: '',
+    }
+    return <Authorize from="pages/activity/activity" achieveParams={achieveParams}></Authorize>
   }
 
   render() {

src/pages/activity/detail/assemble.js

@@ -229,6 +229,17 @@ export default class Detail extends Component {
     //   console.log('生成拼团活动详情海报')
     // })
   }
+  // 保存海报、关闭海报
+  handlePosterVisible = () => {
+    const { posterVisible, actionSheetVisible } = this.state
+    // actionSheet 需要隐藏掉
+    const showActionSheet = posterVisible ? actionSheetVisible : false
+
+    this.setState({
+      posterVisible: !posterVisible,
+      actionSheetVisible: showActionSheet,
+    })
+  }
 
   compActState = (startDate, endDate) => {
     const st = dayjs(startDate).valueOf()
@@ -664,7 +675,8 @@ export default class Detail extends Component {
       leftTime,
       ltTicker,
       consultData,
-      consultShow
+      consultShow,
+      id
     } = this.state
 
     const { userInfo } = this.props
@@ -691,7 +703,12 @@ export default class Detail extends Component {
     // console.log('------posterConfigs------', posterConfigs)
 
     const isJoin = memberList.filter(x => x.personId === userInfo.person.personId)[0] || isStarter
-
+    const achieveParams = {
+      buildingId: detail.buildingId || '',
+      targetName: detail.activityName || '',
+      targetType: 'group',
+      targetId: id || detail.groupActivityId || '',
+    }
     return (
       <Block>
         <BackHomeBtn style={consultShow ? "bottom:310rpx" : ''}></BackHomeBtn>
@@ -701,13 +718,13 @@ export default class Detail extends Component {
         {/* 生成海报 */}
         {posterVisible && !ltTicker.processing &&
           (
-            <Poster configs={posterConfigs} onCancel={this.togglePosterVisible} onFinish={this.togglePosterVisible}></Poster>
+            <Poster configs={posterConfigs} onCancel={this.handlePosterVisible} onFinish={this.handlePosterVisible}></Poster>
           )
         }
 
         {
           grantPhoneVisible &&
-          <AchievePhone user={userInfo.person} onSuccess={this.toggleGrantAvatar} buildingId={detail.buildingId}></AchievePhone>
+          <AchievePhone user={userInfo.person} onSuccess={this.toggleGrantAvatar} achieveParams={achieveParams} buildingId={detail.buildingId}></AchievePhone>
         }
         {
           grantAvatarVisible &&

src/pages/activity/detail/assistance.js

@@ -231,6 +231,16 @@ export default class Detail extends Component {
     //   console.log('生成助力活动详情海报')
     // })
   }
+  // 保存海报、关闭海报
+  handlePosterVisible = () => {
+    const { posterVisible, posters, actionSheetVisible } = this.state
+    // actionSheet 需要隐藏掉
+    const showActionSheet = posterVisible ? actionSheetVisible : false
+    this.setState({
+      posterVisible: !posterVisible,
+      actionSheetVisible: showActionSheet,
+    })
+  }
 
   compActState = (startDate, endDate) => {
     const st = dayjs(startDate).valueOf()
@@ -634,7 +644,8 @@ export default class Detail extends Component {
       leftTime,
       ltTicker,
       consultData,
-      consultShow
+      consultShow,
+      id
     } = this.state
 
     const { userInfo } = this.props
@@ -654,6 +665,13 @@ export default class Detail extends Component {
     // console.log('------posterData------', posterData)
     // console.log('------posterConfigs------', posterConfigs)
     const isJoin = helpList.filter(x => x.personId === userInfo.person.personId)[0] || isStarter
+    const achieveParams = {
+      buildingId: detail.buildingId || '',
+      targetName: detail.title || '',
+      targetType: 'help',
+      targetId: id || detail.helpActivityId || '',
+    }
+
     return (
       <View>
         <BackHomeBtn style={consultShow ? "bottom:200rpx" : ''}></BackHomeBtn>
@@ -663,12 +681,12 @@ export default class Detail extends Component {
         {/* 生成海报 */}
         {posterVisible && !ltTicker.processing &&
           (
-            <Poster configs={posterConfigs} onCancel={this.togglePosterVisible} onFinish={this.togglePosterVisible}></Poster>
+            <Poster configs={posterConfigs} onCancel={this.handlePosterVisible} onFinish={this.handlePosterVisible}></Poster>
           )
         }
         {
           grantPhoneVisible &&
-          <AchievePhone user={userInfo.person} onSuccess={this.toggleGrantAvatar} buildingId={detail.buildingId}></AchievePhone>
+          <AchievePhone user={userInfo.person} onSuccess={this.toggleGrantAvatar} achieveParams={achieveParams} buildingId={detail.buildingId}></AchievePhone>
         }
         {
           grantAvatarVisible &&

src/pages/activity/detail/index.js

@@ -125,13 +125,13 @@ export default class Detail extends Component {
       }).catch(err => {
         console.log(err, "err")
       })
-
+      const maxperson = res.maxEnlistByPerson < 100 ? res.maxEnlistByPerson : 100
       this.setState({
         detail: res,
         isSaved,
         isSign,
         loaded: true,
-        selector: times(res.maxEnlistByPerson || 1).map((_, i) => `${i + 1}`),
+        selector: times(maxperson || 1).map((_, i) => `${i + 1}`),
       }, () => {
 
         const { detail } = this.state
@@ -462,14 +462,22 @@ export default class Detail extends Component {
     const { userInfo = {} } = this.props
     const { person: { phone, personId, nickname, name, tel } = {} } = userInfo
 
+    const achieveParams = {
+      buildingId: detail.buildingId || '',
+      targetName: detail.title || '',
+      targetType: 'activity',
+      targetId: detail.dynamicId || '',
+    }
+    console.log(achieveParams, "achieveParamsachieveParamsachieveParamsachieveParams")
+
     return (
       <Block>
         {/* 生成海报 */}
-        {posterVisible && (<Poster data={posterData} toggle={this.togglePosterStatus}></Poster>)}
+        {posterVisible && (<Poster data={posterData} onCancel={() => this.setState({ posterVisible: false })} toggle={this.togglePosterStatus}></Poster>)}
 
         {
           grantPhoneVisible &&
-          <AchievePhone user={userInfo.person} onSuccess={this.toggleGrantAvatar} buildingId={detail.buildingId}></AchievePhone>
+          <AchievePhone user={userInfo.person} onSuccess={this.toggleGrantAvatar} achieveParams={achieveParams} buildingId={detail.buildingId}></AchievePhone>
         }
         {
           grantAvatarVisible &&

src/pages/activity/detail/poster.js

@@ -214,7 +214,11 @@ export default class Index extends Component {
     Taro.hideLoading();
     this.props.toggle(false)
   }
-
+  onCancel = () => {
+    if (typeof this.props.onCancel === 'function') {
+      this.props.onCancel()
+    }
+  }
   // 保存图片至本地
   saveToAlbum = (e) => {
     e.stopPropagation()
@@ -258,7 +262,7 @@ export default class Index extends Component {
               <View className="con">
                 <View className="con-head">
                   <Text>保存后分享图片</Text>
-                  <Text className="iconfont icon-buoumaotubiao20" onClick={this.hidePoster}></Text>
+                  <Text className="iconfont icon-buoumaotubiao20" onClick={this.onCancel}></Text>
                 </View>
                 <View className="con-body">
                   <Image className="result-img" mode="aspectFit" lazy-load src={this.state.shareImage} onClick={this.onPreview}></Image>

src/pages/card/index.js

@@ -498,7 +498,7 @@ export default class Index extends Component {
     })
   }
   render() {
-    const { makePosterStatus, posterData, grantPhoneVisible, grantAvatarVisible, } = this.state
+    const { makePosterStatus, posterData, grantPhoneVisible, grantAvatarVisible, cardId } = this.state
     const { userInfo, cardInfo, projectDetail } = this.props
     const { person: { personType, personId, phone, tel } } = userInfo
     const { unReadNum, picture, visitors, id, isReport } = cardInfo
@@ -510,14 +510,21 @@ export default class Index extends Component {
     const isConsultant = personType === ROLE_CODE['CONSULTANT']
     const hadPhone = (phone || tel) ? true : false  // nb
     const visibleChatBtn = !isConsultant && !isSelf
+    const achieveParams = {
+      buildingId: buildingId || '',
+      targetName: '个人主页',
+      targetType: 'other',
+      targetId: cardId  || '',
+    }
+    console.log(achieveParams, "achieveParamsachieveParamsachieveParamsachieveParams")
     return (
       <Block>
         {/* 生成海报 */}
-        {makePosterStatus && (<Poster data={posterData} toggle={this.toggleVisiblePoster}></Poster>)}
+        {makePosterStatus && (<Poster data={posterData} onCancel={() => this.setState({ makePosterStatus: false })} toggle={this.toggleVisiblePoster}></Poster>)}
 
         {
           grantPhoneVisible &&
-          <AchievePhone user={userInfo.person} onSuccess={this.toggleGrantAvatar} buildingId={buildingId}></AchievePhone>
+          <AchievePhone user={userInfo.person} onSuccess={this.toggleGrantAvatar} achieveParams={achieveParams} buildingId={buildingId}></AchievePhone>
         }
         {
           grantAvatarVisible &&

src/pages/card/poster.js

@@ -263,7 +263,12 @@ export default class Index extends Component {
     Taro.hideLoading();
     this.props.toggle(false)
   }
-
+  onCancel = () => {
+    Taro.hideLoading();
+    if (typeof this.props.onCancel === 'function') {
+      this.props.onCancel()
+    }
+  }
   // 保存图片至本地
   saveToAlbum = (e) => {
     e.stopPropagation()
@@ -306,7 +311,7 @@ export default class Index extends Component {
               <View className="con">
                 <View className="con-head">
                   <Text>保存后分享图片</Text>
-                  <Text className="iconfont icon-buoumaotubiao20" onClick={this.hidePoster}></Text>
+                  <Text className="iconfont icon-buoumaotubiao20" onClick={this.onCancel}></Text>
                 </View>
                 <View className="con-body">
                   <Image className="result-img" mode="aspectFit" lazy-load src={this.state.shareImage} onClick={this.onPreview}></Image>

src/pages/checkin/index.js

@@ -12,6 +12,7 @@ import {
 import { parseQueryString, getQueryString } from '@/utils/tools'
 import { NONAME } from 'dns';
 import ready from '@/utils/ready'
+
 export default class checkin extends Component {
 
   state = {

src/pages/news/detail/index.js

@@ -360,15 +360,22 @@ export default class NewsDetail extends Component {
   render() {
     const { webViewVisible, grantPhoneVisible, grantAvatarVisible, detail, loaded, isSaved, posterVisible, posterData, posterShow, consultData, consultShow } = this.state
     const { userInfo = { person: {} } } = this.props
-
+    
+    const achieveParams = {
+      buildingId: detail.buildingId || '',
+      targetName: detail.newsName || '',
+      targetType: 'news',
+      targetId: detail.newsId || '',
+    }
+    console.log(achieveParams, "achieveParamsachieveParamsachieveParamsachieveParams")
     return (
       <Block>
         {/* 生成海报 */}
-        {posterVisible && (<Poster data={posterData} toggle={this.handleTogglePoster}></Poster>)}
+        {posterVisible && (<Poster data={posterData} onCancel={() => this.setState({ posterVisible: false })} toggle={this.handleTogglePoster}></Poster>)}
 
         {
           grantPhoneVisible &&
-          <AchievePhone user={userInfo.person} onSuccess={this.toggleGrantAvatar} buildingId={detail.buildingId}></AchievePhone>
+          <AchievePhone user={userInfo.person} onSuccess={this.toggleGrantAvatar} achieveParams={achieveParams} buildingId={detail.buildingId}></AchievePhone>
         }
         {
           grantAvatarVisible &&

src/pages/news/detail/poster.js

@@ -65,7 +65,7 @@ export default class Index extends Component {
       {
         x: 30,
         y: 820,
-        text: data.title||'资讯标题',
+        text: data.title || '资讯标题',
         fontSize: 30,
         color: 'black',
         baseLine: 'middle',
@@ -78,7 +78,7 @@ export default class Index extends Component {
       {
         x: 30,
         y: 890,
-        text: data.posterDescription||'资讯描述',
+        text: data.posterDescription || '资讯描述',
         fontSize: 28,
         color: '#999',
         baseLine: 'middle',
@@ -149,7 +149,7 @@ export default class Index extends Component {
         zIndex: 999
       },
       {
-        url: getDownloadURL(data.avatarurl, 'avatar')  || require('@/assets/default-avatar.png'),
+        url: getDownloadURL(data.avatarurl, 'avatar') || require('@/assets/default-avatar.png'),
         width: 130,
         height: 130,
         y: 630,
@@ -214,7 +214,12 @@ export default class Index extends Component {
     Taro.hideLoading();
     this.props.toggle(false)
   }
-
+  onCancel = () => {
+    Taro.hideLoading();
+    if (typeof this.props.onCancel === 'function') {
+      this.props.onCancel()
+    }
+  }
   // 保存图片至本地
   saveToAlbum = (e) => {
     e.stopPropagation()
@@ -258,7 +263,7 @@ export default class Index extends Component {
               <View className="con">
                 <View className="con-head">
                   <Text>保存后分享图片</Text>
-                  <Text className="iconfont icon-buoumaotubiao20" onClick={this.hidePoster}></Text>
+                  <Text className="iconfont icon-buoumaotubiao20" onClick={this.onCancel}></Text>
                 </View>
                 <View className="con-body">
                   <Image className="result-img" mode="aspectFit" lazy-load src={this.state.shareImage} onClick={this.onPreview}></Image>

src/pages/person/index.js

@@ -189,13 +189,19 @@ export default class Person extends Component {
   }
 
   renderLogin() {
-    return <Authorize></Authorize>
+    const achieveParams = {
+      buildingId: '',
+      targetName: '我的地盘',
+      targetType: 'other',
+      targetId: '',
+    }
+    return <Authorize achieveParams={achieveParams}></Authorize>
   }
 
   renderDetail() {
     const { users, menus, roleName } = this.state
     const { user: { userInfo: { person: { org: { waterMark } = {} }, miniApp: { name } } } } = this.props
-    
+
     // const showQRCode = user.personType === ROLE_CODE['CONSULTANT'] || ROLE_CODE['ESTATE_AGENT'] || ROLE_CODE['CHANNEL_AGENT']
     // const isConsultant = user.personType == ROLE_CODE['CONSULTANT']
     // const isConsultant = user.personType

src/pages/project/detail/index.js

@@ -1478,11 +1478,18 @@ export default class Index extends Component {
     const shwoBuildingVideo = projectDetail.videoUrl ? true : false
     const showMediaBtn = showBuildingImgs + showBuildingVRs + shwoBuildingVideo > 1 // 满足2个就展示
 
+    const achieveParams = {
+      buildingId: projectDetail.buildingId || '',
+      targetName: projectDetail.buildingName || '',
+      targetType: 'building',
+      targetId: projectDetail.buildingId || '',
+    }
+    console.log(achieveParams, "achieveParamsachieveParamsachieveParamsachieveParams")
     return (
       <Block>
         {
           grantPhoneVisible &&
-          <AchievePhone user={userInfo.person} onSuccess={this.toggleGrantAvatar} buildingId={projectDetail.buildingId}></AchievePhone>
+          <AchievePhone user={userInfo.person} onSuccess={this.toggleGrantAvatar} achieveParams={achieveParams}></AchievePhone>
         }
         {
           grantAvatarVisible &&
@@ -1610,7 +1617,7 @@ export default class Index extends Component {
               </ScrollView>
               {/* 生成海报 */}
               {
-                posterStatus && (<Poster data={posterData} toggle={this.togglePosterStatus}></Poster>)
+                posterStatus && (<Poster data={posterData} onCancel={() => this.setState({ posterStatus: false })} toggle={this.togglePosterStatus}></Poster>)
               }
               {/* 底部菜单 */}
               {this.renderBottomMenu()}

src/pages/project/detail/poster.js

@@ -242,7 +242,12 @@ export default class Index extends Component {
     Taro.hideLoading();
     this.props.toggle(false)
   }
-
+  onCancel = () => {
+    Taro.hideLoading();
+    if (typeof this.props.onCancel === 'function') {
+      this.props.onCancel()
+    }
+  }
   // 保存图片至本地
   saveToAlbum = (e) => {
     e.stopPropagation()
@@ -288,7 +293,7 @@ export default class Index extends Component {
               <View className="con">
                 <View className="con-head">
                   <Text>保存后分享图片</Text>
-                  <Text className="iconfont icon-buoumaotubiao20" onClick={this.hidePoster}></Text>
+                  <Text className="iconfont icon-buoumaotubiao20" onClick={this.onCancel}></Text>
                 </View>
                 <View className="con-body">
                   <Image className="result-img" mode="aspectFit" lazy-load src={this.state.shareImage} onClick={this.onPreview}></Image>

src/pages/project/h5Page.js

@@ -166,7 +166,8 @@ export default class Index extends Component {
 
     shareSavePoint({
       event: 'share',
-      eventType: 'h5',
+      eventType: 'activity',
+      targetType: 'h5',
       propertyName: 'h5详情分享',
       consultantId: consultantId,
       sharePersonId: personId,

src/pages/shop/index.js

@@ -214,7 +214,13 @@ export default class Shop extends Component {
   }
 
   renderLogin() {
-    return <Authorize from="pages/shop/index"></Authorize>
+    const achieveParams = {
+      buildingId: '',
+      targetName: '赚积分',
+      targetType: 'other',
+      targetId: '',
+    }
+    return <Authorize from="pages/shop/index" achieveParams={achieveParams}></Authorize>
   }
   handleBannerClick = (item) => {
     console.log(this, "this")

src/routes.js

@@ -0,0 +1,568 @@
+
+const routes = [
+
+  /**********************************
+   *  Tab 页面
+   *********************************/
+
+  {
+    name: '首页',
+    page: 'pages/project/index',
+    pgk: 'main',
+    isTab: true,
+    type: 'main',
+  },
+  {
+    name: '积分商城',
+    page: 'pages/shop/index',
+    pgk: 'main',
+    isTab: true,
+    type: 'other',
+  },
+  {
+    name: '活动资讯',
+    page: 'pages/activity/activity',
+    pgk: 'main',
+    isTab: true,
+    type: 'activity',
+  },
+  {
+    name: '个人中心',
+    page: 'pages/person/index',
+    pgk: 'main',
+    isTab: true,
+    type: 'center',
+  },
+
+  /********************************
+   * 项目相关
+   *******************************/
+  {
+    name: '项目列表',
+    page: 'pages/project/list/index',
+    pgk: 'main',
+    type: 'building',
+  },
+  {
+    name: '地图看房',
+    page: 'pages/project/map/index',
+    pgk: 'main',
+    type: 'building',
+  },
+  {
+    name: '项目详情',
+    page: 'pages/project/detail/index',
+    pgk: 'main',
+    type: 'building',
+  },
+  {
+    name: '项目亮点',
+    page: 'pages/project/detail/highLight',
+    pgk: 'main',
+    type: 'building',
+  },
+  {
+    name: '楼盘周边',
+    page: 'pages/project/detail/map',
+    pgk: 'main',
+    type: 'building',
+  },
+  {
+    name: '楼盘信息',
+    page: 'pages/project/floor/index',
+    pgk: 'main',
+    type: 'building',
+  },
+  {
+    name: '项目相册',
+    page: 'pages/project/album/index',
+    pgk: 'main',
+    type: 'building',
+  },
+
+
+  /**************************************
+   * 商城相关
+   *************************************/
+  {
+    name: '积分规则',
+    page: 'pages/shop/rule/index',
+    pgk: 'main',
+    type: 'other',
+  },
+  {
+    name: '积分明细',
+    page: 'pages/shop/integralDetail/index',
+    pgk: 'main',
+    type: 'other',
+  },
+  {
+    name: '商品详情',
+    page: 'pages/shop/detail/index',
+    pgk: 'main',
+    type: 'other',
+  },
+
+
+  /************************************
+   * 个人中心
+   ***********************************/
+  {
+    name: '登录',
+    page: 'pages/person/login/index',
+    pgk: 'main',
+    type: 'other',
+  },
+  {
+    name: '我的分享',
+    page: 'pages/person/myShare/index',
+    pgk: 'main',
+    type: 'other',
+  },
+  {
+    name: '我的活动',
+    page: 'pages/activity/myActivity',
+    pgk: 'main',
+    type: 'activity',
+  },
+  {
+    name: '我的拼团',
+    page: 'pages/activity/assemblePage',
+    pgk: 'main',
+    type: 'activity',
+  },
+  {
+    name: '我的助力',
+    page: 'pages/activity/assistancePage',
+    pgk: 'main',
+    type: 'activity',
+  },
+  {
+    name: '我的推广码',
+    page: 'pages/person/spread/index',
+    pgk: 'main',
+    type: 'other',
+  },
+  {
+    name: '我的卡片',
+    page: 'pages/card/index',
+    pgk: 'main',
+    type: 'card',
+  },
+  {
+    name: '我的客户',
+    page: 'pages/person/myGuest/index',
+    pgk: 'main',
+    type: 'agent',
+  },
+  {
+    name: '我的收藏',
+    page: 'pages/person/favorite/index',
+    pgk: 'main',
+    type: 'other',
+  },
+  {
+    name: '个人资料',
+    page: 'pages/person/personDetail/index',
+    pgk: 'main',
+    type: 'center',
+  },
+  {
+    name: '编辑资料',
+    page: 'pages/person/personDetail/editDetail/index',
+    pgk: 'main',
+    type: 'center',
+  },
+  {
+    name: '每日签到',
+    page: 'pages/signin/index',
+    pgk: 'main',
+    type: 'other',
+  },
+
+
+  /****************************************
+   * 置业相关
+   ***************************************/
+  {
+    name: '置业列表',
+    page: 'pages/card/list/index',
+    pgk: 'main',
+    type: 'other',
+  },
+  {
+    name: '置业绑定',
+    page: 'pages/card/register/index',
+    pgk: 'main',
+    type: 'other',
+  },
+  {
+    name: '咨询列表',
+    page: 'pages/im/list/index',
+    pgk: 'main',
+    type: 'info',
+  },
+  {
+    name: '聊天咨询',
+    page: 'pages/im/index',
+    pgk: 'main',
+    type: 'info',
+  },
+  {
+    name: '卡片围观记录',
+    page: 'pages/card/fans/index',
+    pgk: 'main',
+    type: 'other',    
+  },
+
+  /***********************************
+   * 客户相关
+   **********************************/
+  {
+    name: '访客信息',
+    page: 'pages/person/myShare/accessRecord',
+    pgk: 'main',
+    type: 'agent',
+  },
+  {
+    name: '客户详情',
+    page: 'pages/person/myGuest/editGuest/index',
+    pgk: 'main',
+    type: 'agent',
+  },
+  {
+    name: '报备客户',
+    page: 'pages/report/index',
+    pgk: 'main',
+    type: 'agent',
+  },
+  {
+    name: '报备授权',
+    page: 'pages/report/login/index',
+    pgk: 'main',
+    type: 'agent',
+  },
+  {
+    name: '报备详情',
+    page: 'pages/report/detail/index',
+    pgk: 'main',
+    type: 'agent',
+  },
+
+
+  /************************************
+   * 活动资讯
+   ***********************************/
+  {
+    name: 'H5',
+    page: 'pages/project/h5Page',
+    pgk: 'main',
+    type: 'activity',
+  },
+  {
+    name: '活动详情',
+    page: 'pages/activity/detail/index',
+    pgk: 'main',
+    type: 'activity',
+  },
+  {
+    name: '助力详情',
+    page: 'pages/activity/detail/assistance',
+    pgk: 'main',
+    type: 'activity',
+  },
+  {
+    name: '拼团详情',
+    page: 'pages/activity/detail/assemble',
+    pgk: 'main',
+    type: 'activity',
+  },
+  {
+    name: '资讯详情',
+    page: 'pages/news/detail/index',
+    pgk: 'main',
+    type: 'news',
+  },
+  {
+    name: '签到',
+    page: 'pages/checkin/index',
+    pgk: 'main',
+    type: 'activity',
+  },
+  {
+    name: '签到结果',
+    page: 'pages/checkin/checkinsuccess/index',
+    pgk: 'main',
+    type: 'activity',
+  },
+
+  /*****************************************
+   * 其他
+   ****************************************/
+  {
+    name: '授权',
+    page: 'pages/person/authorize/index',
+    pgk: 'main',
+    type: 'other',
+  },
+  {
+    name: '授权',
+    page: 'pages/auth/index',
+    pgk: 'main',
+    type: 'other',
+  },
+  {
+    name: '购房政策列表',
+    page: 'pages/policy/index',
+    pgk: 'main',
+    type: 'other',
+  },
+  {
+    name: '购房政策详情',
+    page: 'pages/policy/detail/index',
+    pgk: 'main',
+    type: 'other',
+  },
+  {
+    name: '房贷计算器',
+    page: 'pages/toolKit/index',
+    pgk: 'main',
+    type: 'other',
+  },
+  {
+    name: '房贷计算结果',
+    page: 'pages/toolKit/calculateResult/index',
+    pgk: 'main',
+    type: 'other',
+  },
+  {
+    name: '城市列表',
+    page: 'pages/city/index',
+    pgk: 'main',
+    type: 'other',
+  },
+  {
+    name: '外链容器页',
+    page: 'pages/project/panorama/index',
+    pgk: 'main',
+    type: 'other',
+  },
+
+  /**
+   * 子包: 在线购房
+   */
+  {
+    name: '房源列表',
+    page: 'pages/houseList/index',
+    pgk: 'onlineSelling',
+    type: 'house',
+  },
+  {
+    name: '认筹流程',
+    page: 'pages/raiseMoney/index',
+    pgk: 'onlineSelling',
+    type: 'house',
+  },
+  {
+    name: '合同签署结果',
+    page: 'pages/raiseMoney/signResult',
+    pgk: 'onlineSelling',
+    type: 'house',
+  },
+  {
+    name: '实名认证',
+    page: 'pages/raiseMoney/Certification',
+    pgk: 'onlineSelling',
+    type: 'house',
+  },
+  {
+    name: '直播详情',
+    page: 'pages/live/index',
+    pgk: 'onlineSelling',
+    type: 'house',
+  },
+  {
+    name: '选房帮助',
+    page: 'pages/help/index',
+    pgk: 'onlineSelling',
+    type: 'house',
+  },
+  {
+    name: '选房记录',
+    page: 'pages/records/index',
+    pgk: 'onlineSelling',
+    type: 'house',
+  },
+  {
+    name: '房源详情',
+    page: 'pages/detail/index',
+    pgk: 'onlineSelling',
+    type: 'house',
+  },
+  {
+    name: '预选结果',
+    page: 'pages/detail/resultPage',
+    pgk: 'onlineSelling',
+    type: 'house',
+  },
+  {
+    name: '筛选房源',
+    page: 'pages/screenHouse/index',
+    pgk: 'onlineSelling',
+    type: 'house',
+  },
+  {
+    name: '选择置业',
+    page: 'pages/chooseConsultant/index',
+    pgk: 'onlineSelling',
+    type: 'house',
+  },
+  {
+    name: '认筹协议',
+    page: 'pages/protocol/index',
+    pgk: 'onlineSelling',
+    type: 'house',
+  },
+  {
+    name: '认筹单',
+    page: 'pages/raiseProfile/index',
+    pgk: 'onlineSelling',
+    type: 'house',
+  },
+  {
+    name: '房源清单',
+    page: 'pages/raiseProfile/houseResource',
+    pgk: 'onlineSelling',
+    type: 'house',
+  },
+  {
+    name: '添加预选房源',
+    page: 'pages/addHouse/index',
+    pgk: 'onlineSelling',
+    type: 'house',
+  },
+  {
+    name: '添加其他房源',
+    page: 'pages/houseCart/index',
+    pgk: 'onlineSelling',
+    type: 'house',
+  },
+
+
+  /**
+   * 子包: 不常用功能
+   */
+  {
+    name: '盘客工具',
+    page: 'pages/person/customerAnalysis/index',
+    pgk: 'useless',
+    type: 'agent',
+  },
+  {
+    name: '我的客户',   // 置业-我的客户
+    page: 'pages/person/customerAnalysis/myCustomer',
+    pgk: 'useless',
+    type: 'agent',
+  },
+  {
+    name: '客户分析',
+    page: 'pages/person/customerAnalysis/analysis',
+    pgk: 'useless',
+    type: 'agent',
+  },
+  {
+    name: '我的资料',
+    page: 'pages/person/profile/index',
+    pgk: 'useless',
+    type: 'agent',
+  },
+  {
+    name: '资料审核',
+    page: 'pages/person/profile/detail/index',
+    pgk: 'useless',
+    type: 'agent',
+  },
+  {
+    name: '我的主页',
+    page: 'pages/agent/index',
+    pgk: 'useless',
+    type: 'agent',
+  },
+  {
+    name: '成为经纪人',
+    page: 'pages/agent/become/index',
+    pgk: 'useless',
+    type: 'agent',
+  },
+  {
+    name: '推荐客户',
+    page: 'pages/agent/recommend/index',
+    pgk: 'useless',
+    type: 'agent',
+  },
+  {
+    name: '我的客户',   // 经纪人-我的客户
+    page: 'pages/agent/client/index',
+    pgk: 'useless',
+    type: 'agent',
+  },
+  {
+    name: '客户审核进度',
+    page: 'pages/agent/progress/index',
+    pgk: 'useless',
+    type: 'agent',
+  },
+  {
+    name: '意见反馈',
+    page: 'pages/person/feedback/index',
+    pgk: 'useless',
+    type: 'other',
+  },
+  {
+    name: '积分兑换记录',
+    page: 'pages/shop/record/index',
+    pgk: 'useless',
+    type: 'other',
+  },
+  // {
+  //   name: '我的邀请',
+  //   page: 'pages/agent/invitation/index',
+  //   pgk: 'useless',
+  //   type: '',
+  // },
+
+]
+
+/**
+ * 获取 app pages 列表
+ */
+function getPages() {
+  const grp = routes.reduce((g, r) => {
+    const { pgk, page } = r
+    const pg = g[pgk] || []
+    
+    return Object.assign(g, {
+      [`${pgk}`]: pg.concat(page),
+    })
+  }, {});
+
+  const pages = grp.main;
+  const subPackages = Object.keys(grp).filter(x => x !== 'main').reduce(((pkg, key) => {
+    return pkg.concat({
+      root: key,
+      pages: grp[key],
+    })
+  }),[])
+
+
+  return {
+    pages,
+    subPackages,
+  }
+}
+
+// eslint-disable-next-line import/no-commonjs
+module.exports = {
+  routes,
+  getPages,
+};

src/utils/track.js

@@ -1,4 +1,5 @@
 import { savePoint, updatePoint } from '@/services/common'
+import { routes } from '../routes'
 
 // 此处映射需要与 td_biz_event_type 一致
 const pathEventTypeMap = {
@@ -18,34 +19,36 @@ const pathEventTypeMap = {
  * 用户来源
  * @param {*} router 
  */
+// eslint-disable-next-line import/prefer-default-export
 export async function trackUserSource(router) {
   const { path, query, scene } = router || {}
 
-  const pageInfo = pathEventTypeMap[path] || { type: '', desc: '其他' }
+  const pageInfo = routes.filter(x => path.indexOf(x.page) > -1)[0] || { type: 'other', name: '其他' }
 
   const trackPayload = {
     event: 'start',
     eventType: pageInfo.type,
-    propertyName: pageInfo.desc,
+    propertyName: pageInfo.name,
     data: '{}',
     id: (query || {}).id,
     buildingId: (query || {}).buildingId || '',
+    realScene: scene,
     sceneId: scene,
     sharePersonId: (query || {}).recommender,
   }
-  console.log(trackPayload, "trackPayloadtrackPayloadtrackPayload")
-  console.log(trackPayload.sceneId, "sceneIdsceneIdsceneIdsceneIdsceneId")
-  console.log(trackPayload.eventType, "eventTypeeventTypeeventTypeeventTypeeventType")
+
+  console.log('---app track--->', trackPayload)
 
   try {
     const sceneList = [1005, 1006, 1053, 1042, 1007, 1008, 1011, 1012, 1013, 1045, 1046, 1047, 1048, 1058, 1067, 1000]
-    if (sceneList.indexOf(trackPayload.sceneId) != -1) {
-
-      const { recordId } = await savePoint(trackPayload)
-      return function () { updatePoint(recordId); }
 
+    // 任意页面进入小程序, 都需要埋点
+    // 2020年4月27日 v3.5.21 统计版本
+    if (sceneList.indexOf(trackPayload.sceneId) === -1) {
+      trackPayload.sceneId = 1000
     }
-
+    const { recordId } = await savePoint(trackPayload)
+    return function () { updatePoint(recordId); }
   } catch (e) {
     console.error('进入小程序埋点出错:', e);
     return function () { }

yarn.lock

@@ -138,7 +138,7 @@
 
 "@tarojs/cli@1.3.25":
   version "1.3.25"
-  resolved "https://registry.npm.taobao.org/@tarojs/cli/download/@tarojs/cli-1.3.25.tgz#c009179735aecfc8b37f28551dc8c07193759c48"
+  resolved "https://registry.npm.taobao.org/@tarojs/cli/download/@tarojs/cli-1.3.25.tgz?cache=0&sync_timestamp=1587870666725&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40tarojs%2Fcli%2Fdownload%2F%40tarojs%2Fcli-1.3.25.tgz#c009179735aecfc8b37f28551dc8c07193759c48"
   integrity sha1-wAkXlzWuz8izfyhVHcjAcZN1nEg=
   dependencies:
     "@tarojs/taroize" "1.3.25"
@@ -225,7 +225,7 @@
 
 "@tarojs/components@1.3.25":
   version "1.3.25"
-  resolved "https://registry.npm.taobao.org/@tarojs/components/download/@tarojs/components-1.3.25.tgz#1648a25f8a0aa7624ce23f37e5f3b9828e9b2570"
+  resolved "https://registry.npm.taobao.org/@tarojs/components/download/@tarojs/components-1.3.25.tgz?cache=0&sync_timestamp=1587869858867&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40tarojs%2Fcomponents%2Fdownload%2F%40tarojs%2Fcomponents-1.3.25.tgz#1648a25f8a0aa7624ce23f37e5f3b9828e9b2570"
   integrity sha1-FkiiX4oKp2JM4j835fO5go6bJXA=
   dependencies:
     better-scroll "^1.14.1"
@@ -238,51 +238,51 @@
 
 "@tarojs/plugin-babel@1.3.25":
   version "1.3.25"
-  resolved "https://registry.npm.taobao.org/@tarojs/plugin-babel/download/@tarojs/plugin-babel-1.3.25.tgz?cache=0&sync_timestamp=1587392594010&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40tarojs%2Fplugin-babel%2Fdownload%2F%40tarojs%2Fplugin-babel-1.3.25.tgz#2085e105fa2bfd7c3e64227bee987a7fb23bd05a"
+  resolved "https://registry.npm.taobao.org/@tarojs/plugin-babel/download/@tarojs/plugin-babel-1.3.25.tgz?cache=0&sync_timestamp=1587869859666&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40tarojs%2Fplugin-babel%2Fdownload%2F%40tarojs%2Fplugin-babel-1.3.25.tgz#2085e105fa2bfd7c3e64227bee987a7fb23bd05a"
   integrity sha1-IIXhBfor/Xw+ZCJ77ph6f7I70Fo=
   dependencies:
     babel-core "^6.26.0"
 
 "@tarojs/plugin-csso@1.3.25":
   version "1.3.25"
-  resolved "https://registry.npm.taobao.org/@tarojs/plugin-csso/download/@tarojs/plugin-csso-1.3.25.tgz?cache=0&sync_timestamp=1587392617418&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40tarojs%2Fplugin-csso%2Fdownload%2F%40tarojs%2Fplugin-csso-1.3.25.tgz#f16533650cdb6ecd0e18a880f4a97d48b87040d7"
+  resolved "https://registry.npm.taobao.org/@tarojs/plugin-csso/download/@tarojs/plugin-csso-1.3.25.tgz?cache=0&sync_timestamp=1587869863332&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40tarojs%2Fplugin-csso%2Fdownload%2F%40tarojs%2Fplugin-csso-1.3.25.tgz#f16533650cdb6ecd0e18a880f4a97d48b87040d7"
   integrity sha1-8WUzZQzbbs0OGKiA9Kl9SLhwQNc=
   dependencies:
     csso "^3.5.0"
 
 "@tarojs/plugin-less@1.3.25":
   version "1.3.25"
-  resolved "https://registry.npm.taobao.org/@tarojs/plugin-less/download/@tarojs/plugin-less-1.3.25.tgz?cache=0&sync_timestamp=1587392451500&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40tarojs%2Fplugin-less%2Fdownload%2F%40tarojs%2Fplugin-less-1.3.25.tgz#79d16715efd9dca8d9943c99db838710a7d42d24"
+  resolved "https://registry.npm.taobao.org/@tarojs/plugin-less/download/@tarojs/plugin-less-1.3.25.tgz#79d16715efd9dca8d9943c99db838710a7d42d24"
   integrity sha1-edFnFe/Z3KjZlDyZ24OHEKfULSQ=
   dependencies:
     less "^3.0.4"
 
 "@tarojs/plugin-sass@1.3.25":
   version "1.3.25"
-  resolved "https://registry.npm.taobao.org/@tarojs/plugin-sass/download/@tarojs/plugin-sass-1.3.25.tgz#f1e2932f46819da7b9e89f4a985be70b3dacd0a9"
+  resolved "https://registry.npm.taobao.org/@tarojs/plugin-sass/download/@tarojs/plugin-sass-1.3.25.tgz?cache=0&sync_timestamp=1587869865097&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40tarojs%2Fplugin-sass%2Fdownload%2F%40tarojs%2Fplugin-sass-1.3.25.tgz#f1e2932f46819da7b9e89f4a985be70b3dacd0a9"
   integrity sha1-8eKTL0aBnae56J9KmFvnCz2s0Kk=
   dependencies:
     node-sass "^4.12.0"
     scss-bundle "^2.5.1"
 
-"@tarojs/plugin-sass@^2.1.5":
-  version "2.1.5"
-  resolved "https://registry.npm.taobao.org/@tarojs/plugin-sass/download/@tarojs/plugin-sass-2.1.5.tgz#f0ea12bb4269b9d778db204a18f15e6742a28fe5"
-  integrity sha1-8OoSu0Jpudd42yBKGPFeZ0Kij+U=
+"@tarojs/plugin-sass@^1.3.25":
+  version "1.3.42"
+  resolved "https://registry.npm.taobao.org/@tarojs/plugin-sass/download/@tarojs/plugin-sass-1.3.42.tgz?cache=0&sync_timestamp=1587869865097&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40tarojs%2Fplugin-sass%2Fdownload%2F%40tarojs%2Fplugin-sass-1.3.42.tgz#56cb31582ba71946450a3daeed3447c9dd3b4ae6"
+  integrity sha1-VssxWCunGUZFCj2u7TRHyd07SuY=
   dependencies:
     node-sass "^4.12.0"
     scss-bundle "^2.5.1"
 
 "@tarojs/plugin-uglifyjs@1.3.25":
   version "1.3.25"
-  resolved "https://registry.npm.taobao.org/@tarojs/plugin-uglifyjs/download/@tarojs/plugin-uglifyjs-1.3.25.tgz#4c7e9e0ee4795812979f2cef51ca7b1daea6cf3a"
+  resolved "https://registry.npm.taobao.org/@tarojs/plugin-uglifyjs/download/@tarojs/plugin-uglifyjs-1.3.25.tgz?cache=0&sync_timestamp=1587869864342&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40tarojs%2Fplugin-uglifyjs%2Fdownload%2F%40tarojs%2Fplugin-uglifyjs-1.3.25.tgz#4c7e9e0ee4795812979f2cef51ca7b1daea6cf3a"
   integrity sha1-TH6eDuR5WBKXnyzvUcp7Ha6mzzo=
   dependencies:
     uglify-js "^3.3.24"
 
 "@tarojs/redux@^1.3.25":
   version "1.3.42"
-  resolved "https://registry.npm.taobao.org/@tarojs/redux/download/@tarojs/redux-1.3.42.tgz?cache=0&sync_timestamp=1587392458586&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40tarojs%2Fredux%2Fdownload%2F%40tarojs%2Fredux-1.3.42.tgz#40876a61e5aa66e02d6d2f8658ba7d33248c2cf4"
+  resolved "https://registry.npm.taobao.org/@tarojs/redux/download/@tarojs/redux-1.3.42.tgz?cache=0&sync_timestamp=1587870167684&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40tarojs%2Fredux%2Fdownload%2F%40tarojs%2Fredux-1.3.42.tgz#40876a61e5aa66e02d6d2f8658ba7d33248c2cf4"
   integrity sha1-QIdqYeWqZuAtbS+GWLp9MySMLPQ=
   dependencies:
     "@tarojs/taro" "1.3.42"
@@ -290,7 +290,7 @@
 
 "@tarojs/router@1.3.25":
   version "1.3.25"
-  resolved "https://registry.npm.taobao.org/@tarojs/router/download/@tarojs/router-1.3.25.tgz?cache=0&sync_timestamp=1587392455758&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40tarojs%2Frouter%2Fdownload%2F%40tarojs%2Frouter-1.3.25.tgz#101338d9da181dcd53a9db3566faa1dfb2bdda9f"
+  resolved "https://registry.npm.taobao.org/@tarojs/router/download/@tarojs/router-1.3.25.tgz?cache=0&sync_timestamp=1587869870268&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40tarojs%2Frouter%2Fdownload%2F%40tarojs%2Frouter-1.3.25.tgz#101338d9da181dcd53a9db3566faa1dfb2bdda9f"
   integrity sha1-EBM42doYHc1Tqds1Zvqh37K92p8=
   dependencies:
     invariant "2.2.4"
@@ -313,7 +313,7 @@
 
 "@tarojs/taro-weapp@1.3.25":
   version "1.3.25"
-  resolved "https://registry.npm.taobao.org/@tarojs/taro-weapp/download/@tarojs/taro-weapp-1.3.25.tgz?cache=0&sync_timestamp=1587392461970&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40tarojs%2Ftaro-weapp%2Fdownload%2F%40tarojs%2Ftaro-weapp-1.3.25.tgz#a25f82b10e5a62b1be66d9157e547814d6932252"
+  resolved "https://registry.npm.taobao.org/@tarojs/taro-weapp/download/@tarojs/taro-weapp-1.3.25.tgz?cache=0&sync_timestamp=1587869878069&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40tarojs%2Ftaro-weapp%2Fdownload%2F%40tarojs%2Ftaro-weapp-1.3.25.tgz#a25f82b10e5a62b1be66d9157e547814d6932252"
   integrity sha1-ol+CsQ5aYrG+ZtkVflR4FNaTIlI=
   dependencies:
     "@tarojs/taro" "1.3.25"
@@ -323,21 +323,21 @@
 
 "@tarojs/taro@1.3.25":
   version "1.3.25"
-  resolved "https://registry.npm.taobao.org/@tarojs/taro/download/@tarojs/taro-1.3.25.tgz?cache=0&sync_timestamp=1587392457716&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40tarojs%2Ftaro%2Fdownload%2F%40tarojs%2Ftaro-1.3.25.tgz#70fa2ec933da30f08770739478a76a7ecb752358"
+  resolved "https://registry.npm.taobao.org/@tarojs/taro/download/@tarojs/taro-1.3.25.tgz?cache=0&sync_timestamp=1587869873807&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40tarojs%2Ftaro%2Fdownload%2F%40tarojs%2Ftaro-1.3.25.tgz#70fa2ec933da30f08770739478a76a7ecb752358"
   integrity sha1-cPouyTPaMPCHcHOUeKdqfst1I1g=
   dependencies:
     "@tarojs/utils" "1.3.25"
 
 "@tarojs/taro@1.3.42":
   version "1.3.42"
-  resolved "https://registry.npm.taobao.org/@tarojs/taro/download/@tarojs/taro-1.3.42.tgz?cache=0&sync_timestamp=1587392457716&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40tarojs%2Ftaro%2Fdownload%2F%40tarojs%2Ftaro-1.3.42.tgz#12f995a7c0120dc7b14f08037bcbec1d2b4661ac"
+  resolved "https://registry.npm.taobao.org/@tarojs/taro/download/@tarojs/taro-1.3.42.tgz?cache=0&sync_timestamp=1587869873807&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40tarojs%2Ftaro%2Fdownload%2F%40tarojs%2Ftaro-1.3.42.tgz#12f995a7c0120dc7b14f08037bcbec1d2b4661ac"
   integrity sha1-EvmVp8ASDcexTwgDe8vsHStGYaw=
   dependencies:
     "@tarojs/utils" "1.3.42"
 
 "@tarojs/taroize@1.3.25":
   version "1.3.25"
-  resolved "https://registry.npm.taobao.org/@tarojs/taroize/download/@tarojs/taroize-1.3.25.tgz?cache=0&sync_timestamp=1587392412075&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40tarojs%2Ftaroize%2Fdownload%2F%40tarojs%2Ftaroize-1.3.25.tgz#9e78400c5fbfe3c58da150449376e917719cc89e"
+  resolved "https://registry.npm.taobao.org/@tarojs/taroize/download/@tarojs/taroize-1.3.25.tgz?cache=0&sync_timestamp=1587870658136&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40tarojs%2Ftaroize%2Fdownload%2F%40tarojs%2Ftaroize-1.3.25.tgz#9e78400c5fbfe3c58da150449376e917719cc89e"
   integrity sha1-nnhADF+/48WNoVBEk3bpF3GcyJ4=
   dependencies:
     "@babel/code-frame" "^7.0.0"
@@ -354,7 +354,7 @@
 
 "@tarojs/transformer-wx@1.3.25":
   version "1.3.25"
-  resolved "https://registry.npm.taobao.org/@tarojs/transformer-wx/download/@tarojs/transformer-wx-1.3.25.tgz?cache=0&sync_timestamp=1587392411722&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40tarojs%2Ftransformer-wx%2Fdownload%2F%40tarojs%2Ftransformer-wx-1.3.25.tgz#a1d974f14a3216598f40894bbd1e713106d85180"
+  resolved "https://registry.npm.taobao.org/@tarojs/transformer-wx/download/@tarojs/transformer-wx-1.3.25.tgz?cache=0&sync_timestamp=1587869874735&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40tarojs%2Ftransformer-wx%2Fdownload%2F%40tarojs%2Ftransformer-wx-1.3.25.tgz#a1d974f14a3216598f40894bbd1e713106d85180"
   integrity sha1-odl08UoyFlmPQIlLvR5xMQbYUYA=
   dependencies:
     "@babel/code-frame" "^7.0.0-beta.44"
@@ -384,17 +384,17 @@
 
 "@tarojs/utils@1.3.25":
   version "1.3.25"
-  resolved "https://registry.npm.taobao.org/@tarojs/utils/download/@tarojs/utils-1.3.25.tgz#646698f3bb2babed837447617ccec7bd4ee393e3"
+  resolved "https://registry.npm.taobao.org/@tarojs/utils/download/@tarojs/utils-1.3.25.tgz?cache=0&sync_timestamp=1587869857562&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40tarojs%2Futils%2Fdownload%2F%40tarojs%2Futils-1.3.25.tgz#646698f3bb2babed837447617ccec7bd4ee393e3"
   integrity sha1-ZGaY87srq+2DdEdhfM7HvU7jk+M=
 
 "@tarojs/utils@1.3.42":
   version "1.3.42"
-  resolved "https://registry.npm.taobao.org/@tarojs/utils/download/@tarojs/utils-1.3.42.tgz#93b62c742901297e7f4a30a2e716a90635eb3873"
+  resolved "https://registry.npm.taobao.org/@tarojs/utils/download/@tarojs/utils-1.3.42.tgz?cache=0&sync_timestamp=1587869857562&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40tarojs%2Futils%2Fdownload%2F%40tarojs%2Futils-1.3.42.tgz#93b62c742901297e7f4a30a2e716a90635eb3873"
   integrity sha1-k7YsdCkBKX5/SjCi5xapBjXrOHM=
 
 "@tarojs/webpack-runner@1.3.25":
   version "1.3.25"
-  resolved "https://registry.npm.taobao.org/@tarojs/webpack-runner/download/@tarojs/webpack-runner-1.3.25.tgz?cache=0&sync_timestamp=1587392461558&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40tarojs%2Fwebpack-runner%2Fdownload%2F%40tarojs%2Fwebpack-runner-1.3.25.tgz#e363ff14f36ed047f17294922d04a99b05861fdc"
+  resolved "https://registry.npm.taobao.org/@tarojs/webpack-runner/download/@tarojs/webpack-runner-1.3.25.tgz?cache=0&sync_timestamp=1587870170325&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40tarojs%2Fwebpack-runner%2Fdownload%2F%40tarojs%2Fwebpack-runner-1.3.25.tgz#e363ff14f36ed047f17294922d04a99b05861fdc"
   integrity sha1-42P/FPNu0EfxcpSSLQSpmwWGH9w=
   dependencies:
     "@tarojs/plugin-sass" "1.3.25"
@@ -528,7 +528,7 @@
 
 "@typescript-eslint/experimental-utils@2.29.0":
   version "2.29.0"
-  resolved "https://registry.npm.taobao.org/@typescript-eslint/experimental-utils/download/@typescript-eslint/experimental-utils-2.29.0.tgz?cache=0&sync_timestamp=1587403504946&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40typescript-eslint%2Fexperimental-utils%2Fdownload%2F%40typescript-eslint%2Fexperimental-utils-2.29.0.tgz#3cb8060de9265ba131625a96bbfec31ba6d4a0fe"
+  resolved "https://registry.npm.taobao.org/@typescript-eslint/experimental-utils/download/@typescript-eslint/experimental-utils-2.29.0.tgz#3cb8060de9265ba131625a96bbfec31ba6d4a0fe"
   integrity sha1-PLgGDekmW6ExYlqWu/7DG6bUoP4=
   dependencies:
     "@types/json-schema" "^7.0.3"
@@ -548,7 +548,7 @@
 
 "@typescript-eslint/typescript-estree@2.29.0":
   version "2.29.0"
-  resolved "https://registry.npm.taobao.org/@typescript-eslint/typescript-estree/download/@typescript-eslint/typescript-estree-2.29.0.tgz?cache=0&sync_timestamp=1587403033838&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40typescript-eslint%2Ftypescript-estree%2Fdownload%2F%40typescript-eslint%2Ftypescript-estree-2.29.0.tgz#1be6612bb02fc37ac9f466521c1459a4744e8d3a"
+  resolved "https://registry.npm.taobao.org/@typescript-eslint/typescript-estree/download/@typescript-eslint/typescript-estree-2.29.0.tgz#1be6612bb02fc37ac9f466521c1459a4744e8d3a"
   integrity sha1-G+ZhK7Avw3rJ9GZSHBRZpHROjTo=
   dependencies:
     debug "^4.1.1"
@@ -1415,7 +1415,7 @@ babel-plugin-danger-remove-unused-import@^1.1.1:
   resolved "http://r.cnpmjs.org/babel-plugin-danger-remove-unused-import/download/babel-plugin-danger-remove-unused-import-1.1.2.tgz#ac39c30edfe524ef8cfc411fec5edc479d19e132"
   integrity sha1-rDnDDt/lJO+M/EEf7F7cR50Z4TI=
 
-babel-plugin-macros@^2.0.0:
+babel-plugin-macros@^2.0.0, babel-plugin-macros@^2.8.0:
   version "2.8.0"
   resolved "https://registry.npm.taobao.org/babel-plugin-macros/download/babel-plugin-macros-2.8.0.tgz#0f958a7cc6556b1e65344465d99111a1e5e10138"
   integrity sha1-D5WKfMZVax5lNERl2ZERoeXhATg=
@@ -1441,6 +1441,15 @@ babel-plugin-preval@1.6.4:
     babylon "^6.18.0"
     require-from-string "^2.0.1"
 
+babel-plugin-preval@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npm.taobao.org/babel-plugin-preval/download/babel-plugin-preval-5.0.0.tgz?cache=0&sync_timestamp=1584933834382&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbabel-plugin-preval%2Fdownload%2Fbabel-plugin-preval-5.0.0.tgz#6cabb947ecc241664966e1f99eb56a3b4bb63d1e"
+  integrity sha1-bKu5R+zCQWZJZuH5nrVqO0u2PR4=
+  dependencies:
+    "@babel/runtime" "^7.9.2"
+    babel-plugin-macros "^2.8.0"
+    require-from-string "^2.0.2"
+
 babel-plugin-remove-dead-code@^1.3.2:
   version "1.3.2"
   resolved "http://r.cnpmjs.org/babel-plugin-remove-dead-code/download/babel-plugin-remove-dead-code-1.3.2.tgz#e1a2cd9595bb2f767291f35cab4ec9b467ee62c6"
@@ -1771,7 +1780,7 @@ babel-plugin-transform-jsx-stylesheet@^0.6.5:
 
 babel-plugin-transform-jsx-to-stylesheet@1.3.25:
   version "1.3.25"
-  resolved "https://registry.npm.taobao.org/babel-plugin-transform-jsx-to-stylesheet/download/babel-plugin-transform-jsx-to-stylesheet-1.3.25.tgz?cache=0&sync_timestamp=1587392411365&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbabel-plugin-transform-jsx-to-stylesheet%2Fdownload%2Fbabel-plugin-transform-jsx-to-stylesheet-1.3.25.tgz#d6ec4eece277aeb251eeb4231cbc3198864653d5"
+  resolved "https://registry.npm.taobao.org/babel-plugin-transform-jsx-to-stylesheet/download/babel-plugin-transform-jsx-to-stylesheet-1.3.25.tgz#d6ec4eece277aeb251eeb4231cbc3198864653d5"
   integrity sha1-1uxO7OJ3rrJR7rQjHLwxmIZGU9U=
 
 babel-plugin-transform-object-rest-spread@^6.26.0:
@@ -1808,12 +1817,12 @@ babel-plugin-transform-strict-mode@^6.24.1:
 
 babel-plugin-transform-taroapi@1.3.15:
   version "1.3.15"
-  resolved "https://registry.npm.taobao.org/babel-plugin-transform-taroapi/download/babel-plugin-transform-taroapi-1.3.15.tgz?cache=0&sync_timestamp=1587392454540&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbabel-plugin-transform-taroapi%2Fdownload%2Fbabel-plugin-transform-taroapi-1.3.15.tgz#413de3cc47389387bbd36be292d8945d36caf52e"
+  resolved "https://registry.npm.taobao.org/babel-plugin-transform-taroapi/download/babel-plugin-transform-taroapi-1.3.15.tgz?cache=0&sync_timestamp=1587869872042&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbabel-plugin-transform-taroapi%2Fdownload%2Fbabel-plugin-transform-taroapi-1.3.15.tgz#413de3cc47389387bbd36be292d8945d36caf52e"
   integrity sha1-QT3jzEc4k4e702viktiUXTbK9S4=
 
 babel-plugin-transform-taroapi@1.3.25:
   version "1.3.25"
-  resolved "https://registry.npm.taobao.org/babel-plugin-transform-taroapi/download/babel-plugin-transform-taroapi-1.3.25.tgz?cache=0&sync_timestamp=1587392454540&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbabel-plugin-transform-taroapi%2Fdownload%2Fbabel-plugin-transform-taroapi-1.3.25.tgz#fb361e0e1d6680b012dc0c44f7165f16b416874a"
+  resolved "https://registry.npm.taobao.org/babel-plugin-transform-taroapi/download/babel-plugin-transform-taroapi-1.3.25.tgz?cache=0&sync_timestamp=1587869872042&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbabel-plugin-transform-taroapi%2Fdownload%2Fbabel-plugin-transform-taroapi-1.3.25.tgz#fb361e0e1d6680b012dc0c44f7165f16b416874a"
   integrity sha1-+zYeDh1mgLAS3AxE9xZfFrQWh0o=
 
 babel-preset-env@^1.6.1:
@@ -2242,7 +2251,7 @@ buffer@^4.3.0:
 
 buffer@^5.2.1:
   version "5.6.0"
-  resolved "https://registry.npm.taobao.org/buffer/download/buffer-5.6.0.tgz#a31749dc7d81d84db08abf937b6b8c4033f62786"
+  resolved "https://registry.npm.taobao.org/buffer/download/buffer-5.6.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbuffer%2Fdownload%2Fbuffer-5.6.0.tgz#a31749dc7d81d84db08abf937b6b8c4033f62786"
   integrity sha1-oxdJ3H2B2E2wir+Te2uMQDP2J4Y=
   dependencies:
     base64-js "^1.0.2"
@@ -2546,9 +2555,9 @@ chardet@^0.7.0:
   integrity sha1-kAlISfCTfy7twkJdDSip5fDLrZ4=
 
 "chokidar@>=2.0.0 <4.0.0":
-  version "3.3.1"
-  resolved "https://registry.npm.taobao.org/chokidar/download/chokidar-3.3.1.tgz?cache=0&sync_timestamp=1587380303979&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchokidar%2Fdownload%2Fchokidar-3.3.1.tgz#c84e5b3d18d9a4d77558fef466b1bf16bbeb3450"
-  integrity sha1-yE5bPRjZpNd1WP70ZrG/FrvrNFA=
+  version "3.4.0"
+  resolved "https://registry.npm.taobao.org/chokidar/download/chokidar-3.4.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchokidar%2Fdownload%2Fchokidar-3.4.0.tgz#b30611423ce376357c765b9b8f904b9fba3c0be8"
+  integrity sha1-swYRQjzjdjV8dlubj5BLn7o8C+g=
   dependencies:
     anymatch "~3.1.1"
     braces "~3.0.2"
@@ -2556,7 +2565,7 @@ chardet@^0.7.0:
     is-binary-path "~2.1.0"
     is-glob "~4.0.1"
     normalize-path "~3.0.0"
-    readdirp "~3.3.0"
+    readdirp "~3.4.0"
   optionalDependencies:
     fsevents "~2.1.2"
 
@@ -2834,7 +2843,7 @@ commander@~2.19.0:
 
 commander@~2.8.1:
   version "2.8.1"
-  resolved "https://registry.npm.taobao.org/commander/download/commander-2.8.1.tgz?cache=0&sync_timestamp=1584148407069&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
+  resolved "https://registry.npm.taobao.org/commander/download/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
   integrity sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=
   dependencies:
     graceful-readlink ">= 1.0.0"
@@ -3933,7 +3942,7 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
 
 eslint-config-taro@1.3.25:
   version "1.3.25"
-  resolved "https://registry.npm.taobao.org/eslint-config-taro/download/eslint-config-taro-1.3.25.tgz?cache=0&sync_timestamp=1587392411520&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint-config-taro%2Fdownload%2Feslint-config-taro-1.3.25.tgz#2942428afec697363bb500444c0e7d24e5680913"
+  resolved "https://registry.npm.taobao.org/eslint-config-taro/download/eslint-config-taro-1.3.25.tgz?cache=0&sync_timestamp=1587869873099&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint-config-taro%2Fdownload%2Feslint-config-taro-1.3.25.tgz#2942428afec697363bb500444c0e7d24e5680913"
   integrity sha1-KUJCiv7GlzY7tQBETA59JOVoCRM=
   dependencies:
     eslint-plugin-taro "1.3.25"
@@ -4010,7 +4019,7 @@ eslint-plugin-react@^7.4.0, eslint-plugin-react@^7.8.2:
 
 eslint-plugin-taro@1.3.25:
   version "1.3.25"
-  resolved "https://registry.npm.taobao.org/eslint-plugin-taro/download/eslint-plugin-taro-1.3.25.tgz?cache=0&sync_timestamp=1587392410740&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint-plugin-taro%2Fdownload%2Feslint-plugin-taro-1.3.25.tgz#0739dafc1aae5309eaf07fe97727a5ea545d2f59"
+  resolved "https://registry.npm.taobao.org/eslint-plugin-taro/download/eslint-plugin-taro-1.3.25.tgz?cache=0&sync_timestamp=1587869867967&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint-plugin-taro%2Fdownload%2Feslint-plugin-taro-1.3.25.tgz#0739dafc1aae5309eaf07fe97727a5ea545d2f59"
   integrity sha1-Bzna/BquUwnq8H/pdyel6lRdL1k=
   dependencies:
     has "^1.0.1"
@@ -4074,7 +4083,7 @@ eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0:
 
 eslint@5.16.0, eslint@^5.16.0:
   version "5.16.0"
-  resolved "https://registry.npm.taobao.org/eslint/download/eslint-5.16.0.tgz?cache=0&sync_timestamp=1585359149021&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint%2Fdownload%2Feslint-5.16.0.tgz#a1e3ac1aae4a3fbd8296fcf8f7ab7314cbb6abea"
+  resolved "https://registry.npm.taobao.org/eslint/download/eslint-5.16.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint%2Fdownload%2Feslint-5.16.0.tgz#a1e3ac1aae4a3fbd8296fcf8f7ab7314cbb6abea"
   integrity sha1-oeOsGq5KP72Clvz496tzFMu2q+o=
   dependencies:
     "@babel/code-frame" "^7.0.0"
@@ -4116,7 +4125,7 @@ eslint@5.16.0, eslint@^5.16.0:
 
 eslint@^6.1.0:
   version "6.8.0"
-  resolved "https://registry.npm.taobao.org/eslint/download/eslint-6.8.0.tgz?cache=0&sync_timestamp=1585359149021&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint%2Fdownload%2Feslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb"
+  resolved "https://registry.npm.taobao.org/eslint/download/eslint-6.8.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint%2Fdownload%2Feslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb"
   integrity sha1-YiYtZylzn5J1cjgkMC+yJ8jJP/s=
   dependencies:
     "@babel/code-frame" "^7.0.0"
@@ -4890,9 +4899,9 @@ fsevents@^1.2.7:
     node-pre-gyp "^0.12.0"
 
 fsevents@~2.1.2:
-  version "2.1.2"
-  resolved "https://registry.npm.taobao.org/fsevents/download/fsevents-2.1.2.tgz#4c0a1fb34bc68e543b4b82a9ec392bfbda840805"
-  integrity sha1-TAofs0vGjlQ7S4Kp7Dkr+9qECAU=
+  version "2.1.3"
+  resolved "https://registry.npm.taobao.org/fsevents/download/fsevents-2.1.3.tgz?cache=0&sync_timestamp=1587572647225&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffsevents%2Fdownload%2Ffsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e"
+  integrity sha1-+3OHA66NL5/pAMM4Nt3r7ouX8j4=
 
 fstream@^1.0.0, fstream@^1.0.12:
   version "1.0.12"
@@ -7198,9 +7207,9 @@ mime-db@1.40.0:
   integrity sha1-PiUpB7THrbkGWXtLZWNics+ee6w=
 
 mime-db@^1.28.0:
-  version "1.43.0"
-  resolved "https://registry.npm.taobao.org/mime-db/download/mime-db-1.43.0.tgz?cache=0&sync_timestamp=1578281193492&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmime-db%2Fdownload%2Fmime-db-1.43.0.tgz#0a12e0502650e473d735535050e7c8f4eb4fae58"
-  integrity sha1-ChLgUCZQ5HPXNVNQUOfI9OtPrlg=
+  version "1.44.0"
+  resolved "https://registry.npm.taobao.org/mime-db/download/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
+  integrity sha1-+hHF6wrKEzS0Izy01S8QxaYnL5I=
 
 mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24:
   version "2.1.24"
@@ -7639,9 +7648,9 @@ node-sass@^4.10.0, node-sass@^4.12.0:
     "true-case-path" "^1.0.2"
 
 node-sass@^4.13.1:
-  version "4.13.1"
-  resolved "https://registry.npm.taobao.org/node-sass/download/node-sass-4.13.1.tgz#9db5689696bb2eec2c32b98bfea4c7a2e992d0a3"
-  integrity sha1-nbVolpa7LuwsMrmL/qTHoumS0KM=
+  version "4.14.0"
+  resolved "https://registry.npm.taobao.org/node-sass/download/node-sass-4.14.0.tgz#a8e9d7720f8e15b4a1072719dcf04006f5648eeb"
+  integrity sha1-qOnXcg+OFbShBycZ3PBABvVkjus=
   dependencies:
     async-foreach "^0.1.3"
     chalk "^1.1.1"
@@ -8409,7 +8418,7 @@ performance-now@^2.1.0:
   resolved "http://r.cnpmjs.org/performance-now/download/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
-picomatch@^2.0.4, picomatch@^2.0.7:
+picomatch@^2.0.4, picomatch@^2.2.1:
   version "2.2.2"
   resolved "https://registry.npm.taobao.org/picomatch/download/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
   integrity sha1-IfMz6ba46v8CRo9RRupAbTRfTa0=
@@ -8563,7 +8572,7 @@ postcss-modules-values@^1.3.0:
 
 postcss-plugin-constparse@1.3.25:
   version "1.3.25"
-  resolved "https://registry.npm.taobao.org/postcss-plugin-constparse/download/postcss-plugin-constparse-1.3.25.tgz?cache=0&sync_timestamp=1587392452450&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-plugin-constparse%2Fdownload%2Fpostcss-plugin-constparse-1.3.25.tgz#cb800fa39b3625a8dab2ff485d049c2f718f85e3"
+  resolved "https://registry.npm.taobao.org/postcss-plugin-constparse/download/postcss-plugin-constparse-1.3.25.tgz?cache=0&sync_timestamp=1587869867267&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-plugin-constparse%2Fdownload%2Fpostcss-plugin-constparse-1.3.25.tgz#cb800fa39b3625a8dab2ff485d049c2f718f85e3"
   integrity sha1-y4APo5s2Jajasv9IXQScL3GPheM=
   dependencies:
     postcss "^6.0.22"
@@ -8578,7 +8587,7 @@ postcss-pxtorem@^4.0.1:
 
 postcss-pxtransform@1.3.25:
   version "1.3.25"
-  resolved "https://registry.npm.taobao.org/postcss-pxtransform/download/postcss-pxtransform-1.3.25.tgz?cache=0&sync_timestamp=1587392453573&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-pxtransform%2Fdownload%2Fpostcss-pxtransform-1.3.25.tgz#1159703eeced7cea8b9273711f355b9c24387354"
+  resolved "https://registry.npm.taobao.org/postcss-pxtransform/download/postcss-pxtransform-1.3.25.tgz?cache=0&sync_timestamp=1587869868586&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-pxtransform%2Fdownload%2Fpostcss-pxtransform-1.3.25.tgz#1159703eeced7cea8b9273711f355b9c24387354"
   integrity sha1-EVlwPuztfOqLknNxHzVbnCQ4c1Q=
   dependencies:
     postcss "^6.0.16"
@@ -9080,12 +9089,12 @@ readdirp@^2.2.1:
     micromatch "^3.1.10"
     readable-stream "^2.0.2"
 
-readdirp@~3.3.0:
-  version "3.3.0"
-  resolved "https://registry.npm.taobao.org/readdirp/download/readdirp-3.3.0.tgz#984458d13a1e42e2e9f5841b129e162f369aff17"
-  integrity sha1-mERY0ToeQuLp9YQbEp4WLzaa/xc=
+readdirp@~3.4.0:
+  version "3.4.0"
+  resolved "https://registry.npm.taobao.org/readdirp/download/readdirp-3.4.0.tgz#9fdccdf9e9155805449221ac645e8303ab5b9ada"
+  integrity sha1-n9zN+ekVWAVEkiGsZF6DA6tbmto=
   dependencies:
-    picomatch "^2.0.7"
+    picomatch "^2.2.1"
 
 readline2@^1.0.1:
   version "1.0.1"
@@ -9386,7 +9395,7 @@ require-directory@^2.1.1:
   resolved "http://r.cnpmjs.org/require-directory/download/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
   integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
-require-from-string@^2.0.1:
+require-from-string@^2.0.1, require-from-string@^2.0.2:
   version "2.0.2"
   resolved "https://registry.npm.taobao.org/require-from-string/download/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
   integrity sha1-iaf92TgmEmcxjq/hT5wy5ZjDaQk=
@@ -9585,11 +9594,9 @@ run-async@^2.2.0:
     is-promise "^2.1.0"
 
 run-async@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.npm.taobao.org/run-async/download/run-async-2.4.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frun-async%2Fdownload%2Frun-async-2.4.0.tgz#e59054a5b86876cfae07f431d18cbaddc594f1e8"
-  integrity sha1-5ZBUpbhods+uB/Qx0Yy63cWU8eg=
-  dependencies:
-    is-promise "^2.1.0"
+  version "2.4.1"
+  resolved "https://registry.npm.taobao.org/run-async/download/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
+  integrity sha1-hEDsz5nqPnC9QJ1JqriOEMGJpFU=
 
 run-queue@^1.0.0, run-queue@^1.0.3:
   version "1.0.3"
@@ -9669,9 +9676,9 @@ sass-loader@7.1.0:
     semver "^5.5.0"
 
 sass@^1.23.1:
-  version "1.26.3"
-  resolved "https://registry.npm.taobao.org/sass/download/sass-1.26.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsass%2Fdownload%2Fsass-1.26.3.tgz#412df54486143b76b5a65cdf7569e86f44659f46"
-  integrity sha1-QS31RIYUO3a1plzfdWnob0Rln0Y=
+  version "1.26.5"
+  resolved "https://registry.npm.taobao.org/sass/download/sass-1.26.5.tgz#2d7aecfbbabfa298567c8f06615b6e24d2d68099"
+  integrity sha1-LXrs+7q/ophWfI8GYVtuJNLWgJk=
   dependencies:
     chokidar ">=2.0.0 <4.0.0"
 
@@ -10391,12 +10398,12 @@ style-search@^0.1.0:
 
 stylelint-config-taro-rn@1.3.25:
   version "1.3.25"
-  resolved "https://registry.npm.taobao.org/stylelint-config-taro-rn/download/stylelint-config-taro-rn-1.3.25.tgz?cache=0&sync_timestamp=1587392454269&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstylelint-config-taro-rn%2Fdownload%2Fstylelint-config-taro-rn-1.3.25.tgz#6d3aa9eacaaa7712f87f73608f219c4556fa57b2"
+  resolved "https://registry.npm.taobao.org/stylelint-config-taro-rn/download/stylelint-config-taro-rn-1.3.25.tgz?cache=0&sync_timestamp=1587869871197&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstylelint-config-taro-rn%2Fdownload%2Fstylelint-config-taro-rn-1.3.25.tgz#6d3aa9eacaaa7712f87f73608f219c4556fa57b2"
   integrity sha1-bTqp6sqqdxL4f3NgjyGcRVb6V7I=
 
 stylelint-taro-rn@1.3.25:
   version "1.3.25"
-  resolved "https://registry.npm.taobao.org/stylelint-taro-rn/download/stylelint-taro-rn-1.3.25.tgz?cache=0&sync_timestamp=1587392412300&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstylelint-taro-rn%2Fdownload%2Fstylelint-taro-rn-1.3.25.tgz#b576df2d3e2e502905c6c89114591b81bd24cb17"
+  resolved "https://registry.npm.taobao.org/stylelint-taro-rn/download/stylelint-taro-rn-1.3.25.tgz?cache=0&sync_timestamp=1587869871633&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstylelint-taro-rn%2Fdownload%2Fstylelint-taro-rn-1.3.25.tgz#b576df2d3e2e502905c6c89114591b81bd24cb17"
   integrity sha1-tXbfLT4uUCkFxsiRFFkbgb0kyxc=
   dependencies:
     react-native-known-styling-properties "^1.0.4"
@@ -10518,7 +10525,7 @@ svg-tags@^1.0.0:
 
 swiper@4.4.2:
   version "4.4.2"
-  resolved "https://registry.npm.taobao.org/swiper/download/swiper-4.4.2.tgz?cache=0&sync_timestamp=1586538009404&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fswiper%2Fdownload%2Fswiper-4.4.2.tgz#3a35237cbf4870034784e158b4197b65b763d647"
+  resolved "https://registry.npm.taobao.org/swiper/download/swiper-4.4.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fswiper%2Fdownload%2Fswiper-4.4.2.tgz#3a35237cbf4870034784e158b4197b65b763d647"
   integrity sha1-OjUjfL9IcANHhOFYtBl7Zbdj1kc=
   dependencies:
     dom7 "^2.1.2"
@@ -10598,7 +10605,7 @@ tar@^4:
 
 taro-css-to-react-native@1.3.25:
   version "1.3.25"
-  resolved "https://registry.npm.taobao.org/taro-css-to-react-native/download/taro-css-to-react-native-1.3.25.tgz?cache=0&sync_timestamp=1587392455427&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftaro-css-to-react-native%2Fdownload%2Ftaro-css-to-react-native-1.3.25.tgz#84e10e9b404525c337c8601b802af7b3142a2846"
+  resolved "https://registry.npm.taobao.org/taro-css-to-react-native/download/taro-css-to-react-native-1.3.25.tgz#84e10e9b404525c337c8601b802af7b3142a2846"
   integrity sha1-hOEOm0BFJcM3yGAbgCr3sxQqKEY=
   dependencies:
     camelize "^1.0.0"
@@ -10964,9 +10971,9 @@ uglifyjs-webpack-plugin@1.2.4:
     worker-farm "^1.5.2"
 
 unbzip2-stream@^1.0.9:
-  version "1.4.1"
-  resolved "https://registry.npm.taobao.org/unbzip2-stream/download/unbzip2-stream-1.4.1.tgz?cache=0&sync_timestamp=1586468717158&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Funbzip2-stream%2Fdownload%2Funbzip2-stream-1.4.1.tgz#151b104af853df3efdaa135d8b1eca850a44b426"
-  integrity sha1-FRsQSvhT3z79qhNdix7KhQpEtCY=
+  version "1.4.2"
+  resolved "https://registry.npm.taobao.org/unbzip2-stream/download/unbzip2-stream-1.4.2.tgz?cache=0&sync_timestamp=1587481029897&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Funbzip2-stream%2Fdownload%2Funbzip2-stream-1.4.2.tgz#84eb9e783b186d8fb397515fbb656f312f1a7dbf"
+  integrity sha1-hOueeDsYbY+zl1Ffu2VvMS8afb8=
   dependencies:
     buffer "^5.2.1"
     through "^2.3.8"