@conecli/cone-render 0.9.1-shop2.7 → 0.9.1-shop2.8

package/dist/open/api/shopMember.ts

@@ -1 +1 @@
-import Taro from '@tarojs/taro'
  TaroEventType,
  JUMP_MEMBER_CHANNEL,
  CENTERDISPATCH_JUMPPAGE_VALUE,
  
  CARD_BANNER = 'shopMemberCardVenderCardBanner',
  
  CARD_NAME = 'shopMemberCardVenderCardName',
  
  MEMBERSHIP_LEVEL = 'shopMemberCardMembershipLevel',
  
  MEMBERSHIP_RULE_ENTRANCE = 'shopMemberCardMembershipRuleEntrance',
  
  MEMBERSHIP_POINT = 'shopMemberCardMembershipPoint',
  return new Promise((resolve) => {
    requestServer
      .getCustomerCenterDispatch(params)
      .then(async (response) => {
        if (response.result && response.code === '0') {
          resolve(response.result)
        } else {
          resolve({
            jumpPage:
              response.code === '1'
                ? CENTERDISPATCH_JUMPPAGE_VALUE.NOT_LOGGED_IN
                : CENTERDISPATCH_JUMPPAGE_VALUE.SYSTEM_ERROR,
          })
        }
      })
      .catch((err) => {
        resolve({ jumpPage: CENTERDISPATCH_JUMPPAGE_VALUE.NETWORK_ERROR })
        console.log('oneKeyJoinMember getcustomerCenterDispatch err', err)
      })
  })
  const currentVenderId = global.info.queryInfo.venderId
  const currentShopId = global.info.queryInfo.shopId
  const channel = JUMP_MEMBER_CHANNEL.POP_WEBVIEW
  const toastOpt = {
    duration: 3000,
    image:
      'https://img13.360buyimg.com/img/jfs/t1/196933/39/19850/1479/61b059aaEe969b8db/acb37a47b9034333.png',
  }
  const params = {
    venderId: currentVenderId,
    channel,
    queryVersion:
      isH5AndJdShopView && jdAppVersionStr !== '' ? jdAppVersionStr : '9.2.0', 
  }
  const centerDispatchResult = await getCenterDispatchResult(params)
  console.log(
    'oneKeyJoinMember getcustomerCenterDispatch 接口返回值',
    centerDispatchResult,
  )
  const { jumpPage } = centerDispatchResult
  if (typeof jumpPage !== 'number') {
    console.log(
      'oneKeyJoinMember getcustomerCenterDispatch 接口返回 jumpPage 值类型异常，非数字',
    )
    showFailToast({
      title: '网络繁忙，稍后再试吧～',
      ...toastOpt,
    })
    return
  }
  const centerDispatchJumpPageValue = Number(jumpPage)
  if (
    centerDispatchJumpPageValue ===
      CENTERDISPATCH_JUMPPAGE_VALUE.NETWORK_ERROR ||
    centerDispatchJumpPageValue === CENTERDISPATCH_JUMPPAGE_VALUE.SYSTEM_ERROR
  ) {
    console.log(
      'oneKeyJoinMember getcustomerCenterDispatch 接口网络异常或接口异常',
      jumpPage,
    )
    showFailToast({
      title: '网络繁忙，稍后再试吧～',
      ...toastOpt,
    })
    return
  }
  if (
    centerDispatchJumpPageValue === CENTERDISPATCH_JUMPPAGE_VALUE.NOT_LOGGED_IN
  ) {
    console.log(
      'oneKeyJoinMember getcustomerCenterDispatch 接口返回未登录，跳登录页',
    )
    global
      .doLogin()
      .then((res) => {
        console.log('登录成功', res)
      })
      .catch((err) => {
        console.log('登录失败', err)
      })
    return
  }
  const memberRoleJumpPageValueArr = [
    CENTERDISPATCH_JUMPPAGE_VALUE.MEMBER_CENTER,
    CENTERDISPATCH_JUMPPAGE_VALUE.ISV_MEMBER,
    CENTERDISPATCH_JUMPPAGE_VALUE.JSHOP_ISV_PAGE,
  ]
  const isMemberRole = memberRoleJumpPageValueArr.includes(
    centerDispatchJumpPageValue,
  )
  if (isMemberRole) {
    showFailToast({
      title: '您已是本店会员，无需再次入会',
      ...toastOpt,
    })
    return
  }
  if (!isH5AndJdShopView) {
    JumpEventReport.jdJumpToNewH5MemberCard()
    return
  }
  const { isDegrade = true, isLowVersion = true } = centerDispatchResult
  console.log('一键入会，是否已降级', isDegrade)
  console.log('一键入会，是否低版本', isLowVersion)
  if (isDegrade) {
    console.log('一键入会，已降级')
    showFailToast({
      title: '网络繁忙，稍后再试吧～',
      ...toastOpt,
    })
    return
  }
  if (isLowVersion) {
    console.log('一键入会，低版本')
    JumpEventReport.jdJumpToMemberTab()
    return
  }
  return new Promise((resolve) => {
    const memberCardurl = `${JumpWebUrl.shopH5MemberCardAPP}?venderId=${currentVenderId}&shopId=${currentShopId}&channel=${JUMP_MEMBER_CHANNEL.POP_WEBVIEW}`
    const sourceUrl = encodeURIComponent(window.location.href || '')
    const url =
      sourceUrl && sourceUrl !== ''
        ? `${memberCardurl}&sourceUrl=${sourceUrl}`
        : memberCardurl
    console.log('openPopWebview url', url)
    nativeOpenPopWebView({
      url,
    })
    Taro.eventCenter.off(TaroEventType.JOIN_MEMBER_SUCCESS)
    Taro.eventCenter.on(TaroEventType.JOIN_MEMBER_SUCCESS, (res) => {
      console.log('TaroEventType.JOIN_MEMBER_SUCCESS res', res)
      const { shopId, venderId } = res
      if (shopId === currentShopId && venderId === currentVenderId) {
        resolve(true)
      } else {
        console.log(
          'TaroEventType.JOIN_MEMBER_SUCCESS shopId venderId 不匹配，currentShopId, currentVenderId',
          currentShopId,
          currentVenderId,
        )
        resolve(false)
      }
    })
  })
+import Taro from '@tarojs/taro'
  TaroEventType,
  JUMP_MEMBER_CHANNEL,
  CENTERDISPATCH_JUMPPAGE_VALUE,
  
  CARD_BANNER = 'shopMemberCardVenderCardBanner',
  
  CARD_NAME = 'shopMemberCardVenderCardName',
  
  MEMBERSHIP_LEVEL = 'shopMemberCardMembershipLevel',
  
  MEMBERSHIP_RULE_ENTRANCE = 'shopMemberCardMembershipRuleEntrance',
  
  MEMBERSHIP_POINT = 'shopMemberCardMembershipPoint',
  return new Promise((resolve) => {
    requestServer
      .getCustomerCenterDispatch(params)
      .then(async (response) => {
        if (response.result && response.code === '0') {
          resolve(response.result)
        } else {
          resolve({
            jumpPage:
              response.code === '1'
                ? CENTERDISPATCH_JUMPPAGE_VALUE.NOT_LOGGED_IN
                : CENTERDISPATCH_JUMPPAGE_VALUE.SYSTEM_ERROR,
          })
        }
      })
      .catch((err) => {
        resolve({ jumpPage: CENTERDISPATCH_JUMPPAGE_VALUE.NETWORK_ERROR })
        console.log('oneKeyJoinMember getcustomerCenterDispatch err', err)
      })
  })
  const currentVenderId = global.info.queryInfo.venderId
  const currentShopId = global.info.queryInfo.shopId
  const channel = JUMP_MEMBER_CHANNEL.POP_WEBVIEW
  const toastOpt = {
    duration: 3000,
    image:
      'https://img13.360buyimg.com/img/jfs/t1/196933/39/19850/1479/61b059aaEe969b8db/acb37a47b9034333.png',
  }
  const params = {
    venderId: currentVenderId,
    channel,
    queryVersion:
      isH5AndJdShopView && jdAppVersionStr !== '' ? jdAppVersionStr : '9.2.0', 
  }
  const centerDispatchResult = await getCenterDispatchResult(params)
  console.log(
    'oneKeyJoinMember getcustomerCenterDispatch 接口返回值',
    centerDispatchResult,
  )
  const { jumpPage } = centerDispatchResult
  if (typeof jumpPage !== 'number') {
    console.log(
      'oneKeyJoinMember getcustomerCenterDispatch 接口返回 jumpPage 值类型异常，非数字',
    )
    showFailToast({
      title: '网络繁忙，稍后再试吧～',
      ...toastOpt,
    })
    return
  }
  const centerDispatchJumpPageValue = Number(jumpPage)
  if (
    centerDispatchJumpPageValue ===
    CENTERDISPATCH_JUMPPAGE_VALUE.NETWORK_ERROR ||
    centerDispatchJumpPageValue === CENTERDISPATCH_JUMPPAGE_VALUE.SYSTEM_ERROR
  ) {
    console.log(
      'oneKeyJoinMember getcustomerCenterDispatch 接口网络异常或接口异常',
      jumpPage,
    )
    showFailToast({
      title: '网络繁忙，稍后再试吧～',
      ...toastOpt,
    })
    return
  }
  if (
    centerDispatchJumpPageValue === CENTERDISPATCH_JUMPPAGE_VALUE.NOT_LOGGED_IN
  ) {
    console.log(
      'oneKeyJoinMember getcustomerCenterDispatch 接口返回未登录，跳登录页',
    )
    global
      .doLogin()
      .then((res) => {
        console.log('登录成功', res)
      })
      .catch((err) => {
        console.log('登录失败', err)
      })
    return
  }
  const memberRoleJumpPageValueArr = [
    CENTERDISPATCH_JUMPPAGE_VALUE.MEMBER_CENTER,
    CENTERDISPATCH_JUMPPAGE_VALUE.ISV_MEMBER,
    CENTERDISPATCH_JUMPPAGE_VALUE.JSHOP_ISV_PAGE,
  ]
  const isMemberRole = memberRoleJumpPageValueArr.includes(
    centerDispatchJumpPageValue,
  )
  if (isMemberRole) {
    showFailToast({
      title: '您已是本店会员，无需再次入会',
      ...toastOpt,
    })
    return
  }
  if (!isH5AndJdShopView) {
    JumpEventReport.jdJumpToNewH5MemberCard()
    return
  }
  const { isDegrade = true, isLowVersion = true } = centerDispatchResult
  console.log('一键入会，是否已降级', isDegrade)
  console.log('一键入会，是否低版本', isLowVersion)
  if (isDegrade) {
    console.log('一键入会，已降级')
    showFailToast({
      title: '网络繁忙，稍后再试吧～',
      ...toastOpt,
    })
    return
  }
  if (isLowVersion) {
    console.log('一键入会，低版本')
    JumpEventReport.jdJumpToMemberTab()
    return
  }
  return new Promise((resolve) => {
    const memberCardurl = window?.shopGlobalSwitch?.openNewMemberEntry === 'true' ?
      `${JumpWebUrl.memberCard}?venderId=${currentVenderId}&shopId=${currentShopId}&channel=${JUMP_MEMBER_CHANNEL.POP_WEBVIEW}` :
      `${JumpWebUrl.shopH5MemberCardAPP}?venderId=${currentVenderId}&shopId=${currentShopId}&channel=${JUMP_MEMBER_CHANNEL.POP_WEBVIEW}`
    const sourceUrl = encodeURIComponent(window.location.href || '')
    const url =
      sourceUrl && sourceUrl !== ''
        ? `${memberCardurl}&sourceUrl=${sourceUrl}`
        : memberCardurl
    console.log('openPopWebview url', url)
    nativeOpenPopWebView({
      url,
    })
    Taro.eventCenter.off(TaroEventType.JOIN_MEMBER_SUCCESS)
    Taro.eventCenter.on(TaroEventType.JOIN_MEMBER_SUCCESS, (res) => {
      console.log('TaroEventType.JOIN_MEMBER_SUCCESS res', res)
      const { shopId, venderId } = res
      if (shopId === currentShopId && venderId === currentVenderId) {
        resolve(true)
      } else {
        console.log(
          'TaroEventType.JOIN_MEMBER_SUCCESS shopId venderId 不匹配，currentShopId, currentVenderId',
          currentShopId,
          currentVenderId,
        )
        resolve(false)
      }
    })
  })

package/dist/open/api/track.ts

@@ -1 +1 @@
-import { JumpEventReport, JumpEventReportPromise } from '../../jumpEventReport'
  getCustomClickEventInfo: (obj: object, obj2: object, obj3: object, groupState?: boolean) => object
  getCustomExposureInfo: (obj: object, obj2: object, obj3: object, groupState?: boolean) => object
  initOpenTriggerExposure: (type: string) => void
  logPageIdInfo: Object
  logPnameInfo: Object
  getFloorPointIndexClassName: (obj: object, index?: number, tip?: string) => string
  initOpenTriggerExposure: () => {}
    initOpenTriggerExposure,
    logPageIdInfo,
    logPnameInfo
    getCustomClickEventInfo: ReportContainerData.getCustomClickEventInfo.bind(ReportContainerData),
    getCustomExposureInfo: ReportContainerData.getCustomExposureInfo.bind(ReportContainerData),
    initReportBaseData: ReportContainerData.initReportBaseData.bind(ReportContainerData),
    updateSectionTabDataInfo: ReportContainerData.updateSectionTabDataInfo.bind(ReportContainerData),
    initOpenTriggerExposure: initOpenTriggerExposure.bind(JumpEventReport),
    logPnameInfo: logPnameInfo,
    logPageIdInfo: logPageIdInfo,
    getFloorPointIndexClassName: ReportContainerData.getFloorPointIndexClassName.bind(ReportContainerData)
+import { JumpEventReport, JumpEventReportPromise } from '../../jumpEventReport'
  getCustomClickEventInfo: (obj: object, obj2: object, obj3: object, groupState?: boolean) => object
  getCustomExposureInfo: (obj: object, obj2: object, obj3: object, groupState?: boolean) => object
  initOpenTriggerExposure: (type: string) => void
  logPageIdInfo: Object
  logPnameInfo: Object
  getFloorPointIndexClassName: (obj: object, index?: number, tip?: string) => string
  getIsvClickEventInfo: (obj) => obj,
  getIsvExposureInfo: (obj) => obj,
  getCustomClickEventInfo: (obj) => obj,
  getCustomExposureInfo: (obj) => obj,
  initOpenTriggerExposure: () => {},
  logPageIdInfo: {},
  logPnameInfo: {},
    initOpenTriggerExposure,
    logPageIdInfo,
    logPnameInfo
    getCustomClickEventInfo: ReportContainerData.getCustomClickEventInfo.bind(ReportContainerData),
    getCustomExposureInfo: ReportContainerData.getCustomExposureInfo.bind(ReportContainerData),
    getCustomClickEventInfo: ReportContainerData.getCustomClickEventInfo.bind(ReportContainerData),
    getCustomExposureInfo: ReportContainerData.getCustomExposureInfo.bind(ReportContainerData),
    initReportBaseData: ReportContainerData.initReportBaseData.bind(ReportContainerData),
    updateSectionTabDataInfo: ReportContainerData.updateSectionTabDataInfo.bind(ReportContainerData),
    initOpenTriggerExposure: initOpenTriggerExposure.bind(JumpEventReport),
    logPnameInfo: logPnameInfo,
    logPageIdInfo: logPageIdInfo,
    getFloorPointIndexClassName: ReportContainerData.getFloorPointIndexClassName.bind(ReportContainerData)

package/dist/open/api/util.ts

@@ -1 +1 @@
-import {
  dateFormat,
  showSuccessToast,
  showFailToast,
  showNormalToast,
  isJdApp,
  isH5AndJdShopView,
  isH5,
  isH5AndJdShopViewH5Scroll
  openTaroEventDialog,
  closeTaroEventDialog,
  dateFormat,
  showSuccessToast,
  showFailToast,
  showNormalToast,
  openDialog: openTaroEventDialog,
  closeDialog: closeTaroEventDialog,
  isJdApp,
  isH5AndJdShopView,
  isH5,
  isH5AndJdShopViewH5Scroll
+import {
  dateFormat,
  showSuccessToast,
  showFailToast,
  showNormalToast,
  isJdApp,
  isH5AndJdShopView,
  isH5,
  isH5AndJdShopViewH5Scroll
  openTaroEventDialog,
  closeTaroEventDialog,
  dateFormat,
  showSuccessToast,
  showFailToast,
  showNormalToast,
  openDialog: openTaroEventDialog,
  closeDialog: closeTaroEventDialog,
  isJdApp,
  isH5AndJdShopView,
  isH5,
  isH5AndJdShopViewH5Scroll,

package/dist/sass/app.h5.scss

@@ -295,19 +295,55 @@ taro-radio-core {
 		.weui-check + .weui-icon-checked {
 			vertical-align: middle;
 			&:before {
+        content: "";
+        width: 32px;
+        height: 32px;
+        margin-left: 0;
 				margin-top: -4px;
-				font-size: 36px;
+        border: 2px solid #909090;
+        //color: #909090;
+        //background: url("https://img12.360buyimg.com/imagetools/jfs/t1/206105/34/32968/504/64d35614F8cedb83b/d5953c21e17d17ae.png") no-repeat 0 0 / cover;
+        border-radius: 50%;
+        box-sizing: border-box;
 				vertical-align: middle;
 			}
 		}
 		.weui-check:checked + .weui-icon-checked {
 			&:before {
-				color: #e93b3d;
+        content: "";
+        border: none;
+        background: url("https://img12.360buyimg.com/imagetools/jfs/t1/190964/36/36148/636/64d35614Fd3f012fd/28a6f01faddaedbb.png") no-repeat 0 0 / cover;
 			}
 		}
 	}
 }
-
+taro-checkbox-core{
+  .taro-checkbox_checked {
+    border: 2px solid #909090;
+    //background: url("https://img12.360buyimg.com/imagetools/jfs/t1/206105/34/32968/504/64d35614F8cedb83b/d5953c21e17d17ae.png") no-repeat 0 0 / cover;
+    border-radius: 50%;
+    box-sizing: border-box;
+    &:checked {
+      border: none;
+      background: url("https://img12.360buyimg.com/imagetools/jfs/t1/190964/36/36148/636/64d35614Fd3f012fd/28a6f01faddaedbb.png") no-repeat 0 0 / cover;
+      &:before {
+        content: none;
+      }
+    }
+  }
+}
+.weui-picker{
+  font-size: 30px;
+  .weui-picker__hd{
+    font-size: 32px;
+  }
+  .weui-picker__action{
+    color: #FA2C19;
+    &:first-child{
+      color: #1A1A1A;
+    }
+  }
+}
 
 .taro__toast {
 	transition: none !important;