@conecli/cone-render 0.10.1-beta.6 → 0.10.1-beta.8

package/dist/common/jssdk.ts

@@ -1 +1 @@
-import ready from '../utils/ready'
  return new Promise((resolve, reject) => {
    ready('jmfe', timeout)
      .then(() => {
        registerCode(JSSDK_APP_WEBVIEW_CODE)
        resolve(window['jmfe'])
      })
      .catch(() => {
        console.log('window.jmfe不存在')
        reject(null)
      })
  })
  if (window['jmfe']) {
    console.log('registerCode:', code)
    window['jmfe'].registerCode(code)
  } else {
    console.warn('jmfe对象不存在，可能没有提前引入jd-jssdk.js')
  }
+import ready from '../utils/ready';
  return new Promise((resolve, reject) => {
    ready('jmfe', timeout)
      .then(() => {
        registerCode(JSSDK_APP_WEBVIEW_CODE);
        resolve(window['jmfe']);
      })
      .catch(() => {
        console.log('window.jmfe不存在');
        reject(null);
      });
  });
  if (window['jmfe']) {
    console.log('registerCode:', code);
    window['jmfe'].registerCode(code);
  } else {
    console.warn('jmfe对象不存在，可能没有提前引入jd-jssdk.js');
  }

package/dist/common/token/index.h5.ts

@@ -1 +1 @@
-import { isApp } from '../../utils/jm-common'
  return new Promise((resolve, reject) => {
    let platform: string = getPlatform()
    if (platform === TokenPlatform.TYPE_JDAPP) {
      ready('jmfe', 3000)
        .then(() => {
          console.log('window.jmfe已经存在：', window['jmfe'])
          import('./token.jd')
            .then((data) => {
              console.log('data:', data)
              resolve(data)
            })
            .catch((err) => {
              reject(err)
            })
        })
        .catch((e) => {
          console.log('window.jmfe不存在')
          reject(e)
        })
    }
    else if (platform === TokenPlatform.TYPE_WQ) {
      import('./token.wxapp')
        .then((data) => {
          console.log('data:', data)
          resolve(data)
        })
        .catch((err) => {
          reject(err)
        })
    } else {
      import('./token')
        .then((data) => {
          console.log('data:', data)
          resolve(data)
        })
        .catch((err) => {
          reject(err)
        })
    }
  })
  console.log(e)
  return {}
  return new Promise((resolve) => {
    loadTokenPromise
      .then((proxy: any) => {
        if (proxy?.isLogin) {
          proxy?.isLogin().then((data: boolean) => {
            resolve(data)
          })
        } else {
          resolve(false)
        }
      })
      .catch((err) => {
        resolve(false)
      })
  })
  return new Promise((resolve) => {
    loadTokenPromise
      .then((proxy: any) => {
        if (proxy?.getIsvToken) {
          proxy?.getIsvToken().then((data: string) => {
            resolve(data)
          })
        } else {
          resolve('')
        }
      })
      .catch((err) => {
        resolve('')
      })
  })
  return new Promise((resolve) => {
    loadTokenPromise
      .then((proxy: any) => {
        if (proxy?.toLogin) {
          proxy?.toLogin(options)
          resolve(true)
        } else {
          resolve(false)
        }
      })
      .catch((err) => {
        resolve(false)
      })
  })
  let platform = TokenPlatform.TYPE_M
  if (isApp('jd')) {
    platform = TokenPlatform.TYPE_JDAPP
  }
  else if (isApp('wx') && isApp('mp')) {
    platform = TokenPlatform.TYPE_WQ
  }
  return platform
  let platform = getPlatform()
  let source = platform
  if (platform === TokenPlatform.TYPE_M || platform === TokenPlatform.TYPE_WQ) {
    source = TokenPlatform.TYPE_JDAPP
  }
  return source
  return window?.page_data?.pageChannel || ''
+import global from '../../common';
  return new Promise((resolve, reject) => {
    let platform: string = getPlatform();
    if (platform === TokenPlatform.TYPE_JDAPP) {
      global
        .jmfeReayPromise()
        .then(() => {
          console.log(
            'loadTokenAsync window.jmfe已经存在：',
            window?.jmfe,
            '当前版本',
            window?.jmfe?.VERSION,
          );
          import('./token.jd')
            .then((data) => {
              console.log('data:', data);
              resolve(data);
            })
            .catch((err) => {
              reject(err);
            });
        })
        .catch((e) => {
          console.log('window.jmfe不存在');
          reject(e);
        });
    }
    else if (platform === TokenPlatform.TYPE_WQ) {
      import('./token.wxapp')
        .then((data) => {
          console.log('data:', data);
          resolve(data);
        })
        .catch((err) => {
          reject(err);
        });
    } else {
      import('./token')
        .then((data) => {
          console.log('data:', data);
          resolve(data);
        })
        .catch((err) => {
          reject(err);
        });
    }
  });
  console.log(e);
  return {};
  return new Promise((resolve) => {
    loadTokenPromise
      .then((proxy: any) => {
        if (proxy?.isLogin) {
          proxy?.isLogin().then((data: boolean) => {
            resolve(data);
          });
        } else {
          resolve(false);
        }
      })
      .catch((err) => {
        console.log(err);
        resolve(false);
      });
  });
  return new Promise((resolve) => {
    loadTokenPromise
      .then((proxy: any) => {
        if (proxy?.getIsvToken) {
          proxy?.getIsvToken().then((data: string) => {
            resolve(data);
          });
        } else {
          resolve('');
        }
      })
      .catch((err) => {
        console.log(err);
        resolve('');
      });
  });
  return new Promise((resolve) => {
    loadTokenPromise
      .then((proxy: any) => {
        if (proxy?.toLogin) {
          proxy?.toLogin(options);
          resolve(true);
        } else {
          resolve(false);
        }
      })
      .catch((err) => {
        console.log(err);
        resolve(false);
      });
  });
  let platform = TokenPlatform.TYPE_M;
  if (isApp('jd')) {
    platform = TokenPlatform.TYPE_JDAPP;
  }
  else if (isApp('wx') && isApp('mp')) {
    platform = TokenPlatform.TYPE_WQ;
  }
  return platform;
  let platform = getPlatform();
  let source = platform;
  if (platform === TokenPlatform.TYPE_M || platform === TokenPlatform.TYPE_WQ) {
    source = TokenPlatform.TYPE_JDAPP;
  }
  return source;
  return window?.page_data?.pageChannel || '';

package/dist/common/token/token.jd.ts

@@ -1 +1 @@
-console.log('load token.jd')
  return new Promise((resolve) => {
    if (window['jmfe']) {
      window['jmfe'].isJDAppLogin().then(({ data }) => {
        if (data === '1') {
          resolve(true)
        } else if (data === '0') {
          resolve(false)
        }
      })
    } else {
      console.warn('jmfe对象不存在，可能没有提前动态引入jd-jssdk.js')
      resolve(false)
    }
  })
  return requestIsvToken(window.location.href)
  if (window['jmfe']) {
    window['jmfe'].toLogin(options)
  } else {
    console.warn('jmfe对象不存在，可能没有提前动态引入jd-jssdk.js')
  }
  if (window['jmfe']) {
    console.log('registerCode:', code)
    window['jmfe'].registerCode(code)
  } else {
    console.warn('jmfe对象不存在，可能没有提前引入jd-jssdk.js')
  }
  return new Promise((resolve) => {
    console.log('requestIsvToken:', url)
    if (window['jmfe']) {
      window['jmfe']
        .requestIsvToken(url)
        .then((result: any) => {
          console.log('requestIsvToken result:' + JSON.stringify(result))
          const { status, data, msg } = result
          if (status === '0') {
            resolve(data || '')
          } else {
            resolve('')
          }
        })
        .catch((e: any) => {
          console.log('requestIsvToken error:' + JSON.stringify(e))
          resolve('')
        })
    } else {
      console.warn('jmfe对象不存在，可能没有提前引入jd-jssdk.js')
      resolve('')
    }
  })
+import { isJdAndHarmonyDevice, draBusinessCustomReport } from '../../utils/h5Utils';
  draBusinessCustomReport({
    type,
    errMsg,
    data,
  });
  return new Promise((resolve) => {
    if (window['jmfe']) {
      window['jmfe'].isJDAppLogin().then(({ data }) => {
        if (data === '1') {
          resolve(true);
        } else if (data === '0') {
          resolve(false);
        }
      });
    } else {
      console.warn('jmfe对象不存在，可能没有提前动态引入jd-jssdk.js');
      resolve(false);
    }
  });
  return requestIsvToken(window.location.href);
  if (window['jmfe']) {
    window['jmfe'].toLogin(options);
  } else {
    console.warn('jmfe对象不存在，可能没有提前动态引入jd-jssdk.js');
  }
  if (window['jmfe']) {
    console.log('registerCode:', code);
    window['jmfe'].registerCode(code);
  } else {
    console.warn('jmfe对象不存在，可能没有提前引入jd-jssdk.js');
  }
  const plugin = 'JDHybridLoginPlugin';
  const action = 'requestIsvToken';
  const params = { url };
  return jmfe.callNative(plugin, action, params);
  return new Promise((resolve) => {
    console.log('requestIsvToken:', url);
    if (window['jmfe']) {
      const jmfeVersion = window['jmfe'].VERSION || 'unknow';
      try {
        (isJdAndHarmonyDevice
          ? requestIsvTokenHarmony(url)
          : window['jmfe'].requestIsvToken(url)
        ).then((result: any) => {
          console.log('requestIsvToken result:' + JSON.stringify(result));
          const { status, data } = result;
          if (status === '0') {
            resolve(data || '');
          } else {
            resolve('');
          }
          if (!data) {
            exceptionReport({
              data: {
                desc: '调用API有返回，但token值为空',
                jmfeVersion,
                originResult: result,
                url,
              },
            });
          }
        });
      } catch (error) {
        resolve('');
        const errorInfo = {
          name: error?.name,
          message: error?.message,
          stack: error?.stack,
        };
        exceptionReport({
          data: {
            desc: '调用API发生异常',
            jmfeVersion,
            error: errorInfo,
            url,
          },
        });
      }
    } else {
      resolve('');
      exceptionReport({
        data: {
          desc: '前置依赖window.jmfe不存在',
        },
      });
    }
  });

package/dist/common/wxappApi.ts

@@ -1 +1 @@
-import * as WXAPP_LOGIN from '../wxapp/common/login/login.js'
+import * as WXAPP_LOGIN from '../wxapp/common/login/login.js';
  WXAPP_LOGIN,
  WXAPP_BIZ,
  WXAPP_USER_INFO,
  WXAPP_NAVIGATOR,
  WXAPP_REPORT_GDT,
  WXAPP_PARAMS_SIGN,
  WXAPP_FINGER_REPORT,
  WXAPP_REPORT_MANAGE,
  WXAPP_SUBS_GUIDER,
  WXAPP_ADDRESS_V2_API,

package/dist/components/base/CommonFloorHead/index.module.scss

@@ -1,148 +1,163 @@
 .d-root {
-	position: relative;
-	width: 100%;
-	margin-bottom: -24px;
-	background-color: #ffffff;
+  position: relative;
+  width: 100%;
+  margin-bottom: -24px;
+  background-color: #ffffff;
 }
 
 .d-content-wrap {
-	position: absolute;
-	// display: flex;
-	// align-items: center;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 96px;
-	// height: 100%;
-
-	&.d-has-title-bg {
-		background-size: cover;
-
-		.d-text {
-			// margin-top: -14px;
-			color: #ffffff;
-		}
-
-		.d-sub-text {
-			// margin-top: -8px;
-			color: #ffffff;
-		}
-
-		.d-content {
-			bottom: 40px;
-		}
-	}
-
-	&.d-type-is-img {
-		.d-content {
-			bottom: 44%; // 当图片标题类型渲染时，兼容新老数据，下发的图片高度会有几个尺寸，所以这里改成百分比
-		}
-	}
-
-	.d-text {
-		// margin-top: 16px;
-		margin-left: 20px;
-		font-family: 'PingFang SC';
-		font-size: 32px;
-		// line-height: 32px;
-		font-weight: bold;
-		color: #1a1a1a;
-
-		// hack修复在使用overflowhidden（为了实现过长自动出现省略号）前提下，某些字体，例如PingFang SC，默认行高时，基线和底线部分的字体内容（例如：jpqy）有可能显示不完整的问题
-		position: relative;
-		top: 2px;
-		padding-bottom: 2px;
+  position: absolute;
+  // display: flex;
+  // align-items: center;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 96px;
+  // height: 100%;
+
+  &.d-has-title-bg {
+    background-size: cover;
+
+    .d-text {
+      // margin-top: -14px;
+      color: #ffffff;
+    }
+
+    .d-sub-text {
+      // margin-top: -8px;
+      color: #ffffff;
+    }
+
+    .d-content {
+      bottom: 40px;
+    }
+  }
+
+  &.d-type-is-img {
+    .d-content {
+      bottom: 44%; // 当图片标题类型渲染时，兼容新老数据，下发的图片高度会有几个尺寸，所以这里改成百分比
+    }
+  }
+
+  .d-text {
+    // margin-top: 16px;
+    margin-left: 20px;
+    font-family: 'PingFang SC';
+    font-size: 32px;
+    // line-height: 32px;
+    font-weight: bold;
+    color: #1a1a1a;
+
+    // hack修复在使用overflowhidden（为了实现过长自动出现省略号）前提下，某些字体，例如PingFang SC，默认行高时，基线和底线部分的字体内容（例如：jpqy）有可能显示不完整的问题
+    position: relative;
+    top: 2px;
+    padding-bottom: 2px;
     // 文字titile行高不够被遮盖问题 比如“g”字母
     line-height: 1.3;
-	}
-
-	.d-vertical-line {
-		position: relative;
-		top: -4px;
-		width: 1px;
-		height: 24px;
-		margin-left: 12px;
-		opacity: 0.3;
-		background: #ffffff;
-	}
-
-	.d-sub-text {
-		position: relative;
-		top: -2px;
-		margin-left: 12px;
-		font-family: 'PingFang SC';
-		font-size: 24px;
-		color: #808080;
-	}
+  }
+
+  .d-vertical-line {
+    position: relative;
+    top: -4px;
+    width: 1px;
+    height: 24px;
+    margin-left: 12px;
+    opacity: 0.3;
+    background: #ffffff;
+  }
+
+  .d-sub-text {
+    position: relative;
+    top: -2px;
+    margin-left: 12px;
+    font-family: 'PingFang SC';
+    font-size: 24px;
+    color: #808080;
+  }
 }
 
 .d-content-wrap-relative {
-	position: relative;
+  position: relative;
 }
 
 .d-content {
-	position: absolute;
-	bottom: 22px;
-	width: 100%;
-	display: flex;
-	justify-content: space-between;
-	align-items: flex-end;
+  position: absolute;
+  bottom: 22px;
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-end;
 }
 
 .d-content-left {
-	flex: 1;
-	display: flex;
-	justify-content: flex-start;
-	align-items: flex-end;
-	max-width: calc(100% - 108px);
+  flex: 1;
+  display: flex;
+  justify-content: flex-start;
+  align-items: flex-end;
+  max-width: calc(100% - 108px);
 }
 
 .d-content-right {
-	display: flex;
-	align-items: flex-end;
-	flex-shrink: 0;
+  display: flex;
+  align-items: flex-end;
+  flex-shrink: 0;
 }
 
 .d-title-more {
-	position: relative;
-	top: 16px;
-	display: flex;
-	align-items: flex-end;
-	height: 56px;
-	padding-bottom: 20px;
-	padding-left: 20px;
-	padding-right: 20px;
+  position: relative;
+  top: 16px;
+  display: flex;
+  align-items: flex-end;
+  height: 56px;
+  padding-bottom: 20px;
+  padding-left: 20px;
+  padding-right: 20px;
 }
 
 .d-title-more-text {
-	font-family: 'PingFang SC';
-	font-size: 24px;
-	color: #808080;
-	display: flex;
-	align-items: center;
-	font-weight: normal;
+  font-family: 'PingFang SC';
+  font-size: 24px;
+  color: #808080;
+  display: flex;
+  align-items: center;
+  font-weight: normal;
 }
 
 .d-title-more-text-white {
-	color: #ffffff;
+  color: #ffffff;
 }
 
 .d-title-more-arrow {
-	position: relative;
-	top: -4px;
-	width: 12px;
-	height: 20px;
-	margin-left: 10px;
+  position: relative;
+  top: -4px;
+  width: 12px;
+  height: 20px;
+  margin-left: 10px;
 }
 
 .d-img {
-	width: 100%;
-	display: block;
-	// height: auto;
-	height: 96px;
-	background: no-repeat top/100% auto;
+  width: 100%;
+  display: block;
+  // height: auto;
+  height: 96px;
+  background: no-repeat top/100% auto;
 }
 
 .d-place-holder {
-	height: 24px;
+  height: 24px;
+}
+
+:global {
+  .d-shop-pad {
+    :local {
+      .d-root {
+        .d-content-wrap-for-img {
+          height: 164px;
+        }
+        .d-img-bg {
+          height: 164px;
+        }
+      }
+    }
+  }
 }