Merge branch 'dev' into test

src/pages/commodity/productWillCheck/checkProducts.tsx

@@ -209,7 +209,6 @@ const viewProducts: React.FC<{}> = () => {
   }
 
   /* 品类类型&商品类型 */
-  //1-实物商品、2-虚拟商品、3-服务商品
   const renderCustomerCategoryType = (type: number) => {
     if(type === 1 ) return '实物商品'
     if(type === 2 ) return '虚拟商品'

src/pages/commodity/products/viewProducts.tsx

@@ -199,7 +199,6 @@ const viewProducts: React.FC<{}> = () => {
   }
 
   /* 品类类型&商品类型 */
-  //1-实物商品、2-虚拟商品、3-服务商品
   const renderCustomerCategoryType = (type: number) => {
     if(type === 1 ) return '实物商品'
     if(type === 2 ) return '虚拟商品'

src/pages/ruleSettingManage/transactionRules/components/RuleSetting.tsx

@@ -217,7 +217,7 @@ const RuleSetting:React.FC<RuleSettingProps> = (props) => {
 
   // 会员弹框筛选select值
   const fetchSelectOptions = async () => {
-    const res = await PublicApi.getMemberManagePageitems()
+    const res = await PublicApi.getMemberManagePageitems({roleTypeEnum: '1'})
     if (res.code === 1000) {
       const { data = {} }: any = res
       const {