Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-system into v2

src/pages/commodity/productWillCheck/checkProducts.tsx

@@ -691,7 +691,7 @@ const viewProducts: React.FC<{}> = () => {
               {/* 没有价格属性默认一行直接显示图片 */}
               <div className={styles.productImgBox}>
                 {
-                  productDetail?.unitPriceAndPicList[0].commodityPic.length > 0 && productDetail?.unitPriceAndPicList[0].commodityPic.map((_item, index) =>
+                  productDetail?.unitPriceAndPicList?.length && productDetail?.unitPriceAndPicList[0].commodityPic.length > 0 && productDetail?.unitPriceAndPicList[0].commodityPic.map((_item, index) =>
                     <Image
                       key={index}
                       width={104}

src/pages/commodity/products/viewProducts.tsx

@@ -648,7 +648,7 @@ const viewProducts: React.FC<{}> = () => {
               {/* 没有价格属性默认一行直接显示图片 */}
               <div className={styles.productImgBox}>
                 {
-                  productDetail?.unitPriceAndPicList[0].commodityPic.length>0 && productDetail?.unitPriceAndPicList[0].commodityPic.map((_item, index) =>
+                  productDetail?.unitPriceAndPicList?.length && productDetail?.unitPriceAndPicList[0].commodityPic.length>0 && productDetail?.unitPriceAndPicList[0].commodityPic.map((_item, index) =>
                   <Image
                     key={index}
                     className={styles.imgItem}