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

package.json

@@ -30,7 +30,7 @@
     "@umijs/preset-react": "1.x",
     "@umijs/test": "^3.2.0",
     "bizcharts": "^4.0.7",
-    "god": "0.1.7",
+    "god": "^0.1.13",
     "god-tool": "2.4.0",
     "lint-staged": "^10.0.7",
     "mobx": "^5.15.4",

src/global/styles/global.less

@@ -50,14 +50,14 @@ h6 {
   position: relative;
 
   &::before {
-    content         : "";
-    display         : inline-block;
-    position        : absolute;
-    left            : 0;
-    top             : 50%;
-    margin-top      : -.42667rem;
-    width           : 2px;
-    height          : .85333rem;
+    content: "";
+    display: inline-block;
+    position: absolute;
+    left: 0;
+    top: 50%;
+    margin-top: -.42667rem;
+    width: 2px;
+    height: .85333rem;
     background-color: @primary-color;
     box-shadow: 0 0.14933rem 0.256rem 0 rgba(97, 144, 232, .2);
     border-radius: 1px;
@@ -80,6 +80,11 @@ h6 {
 // 公共着色 主体颜色
 .commonPickColor {
   color: @main-color;
+  cursor: pointer;
+}
+
+.padLeft0 {
+  padding-left: 0!important;
 }
 
 // 公共状态 圆点
@@ -123,7 +128,7 @@ h6 {
 
 .sc-fzpans {
   display: block;
-  width  : 100%;
+  width: 100%;
 }
 
 

src/layouts/components/SelectLang.tsx

@@ -16,7 +16,7 @@ interface countryItem {
 
 const SelectLang: React.FC = () => {
   // 此处暂时无接口， 对接接口后需用枚举类型做补充
-  const [currentLangKey, setCurrentLangKey] = useState<string>('zh-CN')
+  const [currentLangKey, setCurrentLangKey] = useState<string>('cn')
 
   useEffect(() => {
     console.log(getLocale(), "locale")

src/pages/classAndProperty/attribute/index.tsx

@@ -19,7 +19,7 @@ const Attribute: React.FC<{}> = () => {
   const fetchData = (params?: any) => {
     console.log(params, '搜索参数')
     return new Promise((resolve, reject) => {
-      PublicApi.getProductCustomerGetCustomerAttributeList({ current: params.page, name: params.name || '', pageSize: params.rows }).then(res => {
+      PublicApi.getProductCustomerGetCustomerAttributeList({ ...params, name: params.name || '' }).then(res => {
         resolve(res.data)
       })
     })

src/pages/commodity/goods/index.tsx

@@ -128,7 +128,7 @@ const Goods: React.FC<{}> = () => {
   const fetchData = (params: any) => {
     console.log(params)
     return new Promise((resolve, reject) => {
-      let obj = {...params, pageSize: params.rows, current: params.page}
+      let obj = {...params}
       PublicApi.getProductGoodsGetGoodsList(obj).then(res=>{
         resolve(res.data)
       })

src/pages/commodity/products/index.tsx

@@ -237,7 +237,7 @@ const Products: React.FC<{}> = () => {
     console.log(params, filterParams)
     return new Promise((resolve, reject) => {
       //@ts-ignore
-      PublicApi.getProductCommodityGetCommodityList({...filterParams, pageSize: params.rows, current: params.page}).then(res => {
+      PublicApi.getProductCommodityGetCommodityList({ ...filterParams, ...params}).then(res => {
         console.log(res, 'res')
         const { data } = res
         resolve(data)

src/pages/repositories/index.tsx

@@ -220,7 +220,7 @@ const Repositories: React.FC<{}> = () => {
   }
 
   const handleAdjust = (record: any) => {
-    history.push(`/repositories/adjustRepository?id=${record.key}`)
+    history.push(`/memberCenter/commodityAbility/repositories/adjustRepository?id=${record.key}`)
   }
 
   return (

src/pages/shop/components/citySelect/index.tsx

@@ -93,8 +93,8 @@ const CityCascader: React.FC<CitySelectPropsType> = (props) => {
     onChange(newData)
   }
 
-  const handleAddNewSelect = (index: number) => {
-    onAdd({ index, provinceId: 0, cityId: 0 })
+  const handleAddNewSelect = () => {
+    onAdd({ index: selectData.length + 1, provinceId: 0, cityId: 0 })
   }
   const handleReduceSelect = (index: number) => {
     if (selectData.length > 1) {
@@ -128,7 +128,7 @@ const CityCascader: React.FC<CitySelectPropsType> = (props) => {
             </Select>
             {
               index === selectData.length - 1 && (
-                <div className={cx(styles.opration_btn, styles.add)} onClick={() => handleAddNewSelect(index + 1)}>
+                <div className={cx(styles.opration_btn, styles.add)} onClick={() => handleAddNewSelect()}>
                   <PlusOutlined />
                 </div>
               )

src/pages/shop/shopInfo/index.tsx

@@ -40,7 +40,10 @@ const ShopInfo: React.FC = () => {
 
   const handleReduceCitySelect = (index: number) => {
     let temp = JSON.parse(JSON.stringify(selectCityData))
+    console.log(index, "index")
+    console.log(temp)
     temp = temp.filter((item: any) => item.index !== index)
+    console.log(temp)
     setSelectCityData(temp)
   }
 

src/pages/trademark/index.tsx

@@ -19,7 +19,7 @@ const Trademark: React.FC<{}> = () => {
 
   const fetchData = (params: any) => {
     return new Promise((resolve, reject) => {
-      PublicApi.getProductBrandGetBrandList({ current: params.page, pageSize: params.rows, name: params.name || '', status: params.status || 0 }).then(res => {
+      PublicApi.getProductBrandGetBrandList({ ...params, name: params.name || '', status: params.status || 0 }).then(res => {
         const { data } = res
         resolve(data)
       })