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

src/pages/commodity/products/index.tsx

@@ -371,7 +371,7 @@ const Products: React.FC<{}> = () => {
         memberRoleId: getAuth().memberRoleId
       }).then(res => {
         if(res.data?.id){
-          setShopId(res.data.id)
+          setShopId(res.data)
           setCheckedValues(values)
         }else{
           message.error('您还还未创建店铺，请先创建店铺！')
@@ -407,7 +407,7 @@ const Products: React.FC<{}> = () => {
     if(isUp) {
       if(checkedValues.length > 0){
         const fn = isBatch ? PublicApi.postProductCommodityPublishCommodityBatch : PublicApi.postProductCommodityPublishCommodity
-        fn(isBatch ? {storeId: shopId, shopList: checkedValues, idList: currentRef.current} : {storeId: shopId, ...params}).then(res => {
+        fn(isBatch ? {storeId: shopId['id'], storeName: shopId['name'], shopList: checkedValues, idList: currentRef.current} : {storeId: shopId['id'], storeName: shopId['name'], ...params}).then(res => {
           setUpDownModal(false)
           ref.current.reload()
           setIsDisabledOKbtn(false)

src/pages/transaction/components/approvedOrderModal/index.tsx

@@ -219,7 +219,7 @@ const ApprovedOrderModal:React.FC<ApprovedOrderModalProps> = (props) => {
           }
         })
         // 上级审核不通过
-        if(data && (data.innerStatusName === '提交审核不通过')) {
+        if(data && (data.innerStatusName === '提交审核不通过' || data.innerStatusName === '审核不通过(一级)' || data.innerStatusName === '审核不通过(二级)')) {
           ctx.setFieldValue("agree", 0)
           ctx.setFieldState("agree", state => {
             state.props["x-component-props"] = {