Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0

src/pages/exchangecode/exchangecodeAdd/index.jsx

@@ -224,7 +224,8 @@ export default class exchangeAdd extends React.Component {
   getProductInfoSelectData(reseller_id) {
     return new Promise((resolve, reject) => {
       let param = {
-        reseller_id: reseller_id
+        reseller_id: reseller_id,
+        type: 1
       }
       getProductInfoSelect(param).then((res) => {
         if (res.code === 200) {
@@ -671,7 +672,8 @@ export default class exchangeAdd extends React.Component {
       this.setState({ product_title: "新增立减金", newGoldLoading: true })
     }
     let param = {
-      reseller_id: direct_reseller_ids
+      reseller_id: direct_reseller_ids,
+      type: 1
     }
     try {
       getProductInfoSelect(param).then((res) => {

src/pages/plan/product/add.js

@@ -574,6 +574,17 @@ export default class adduserinfo extends React.Component {
     return (
       <div id='addproduct'>
         <Form model={this.state.model} rules={rules} ref='form1'>
+          <FormItem labelname='商品类型' prop='type' id='type'>
+            <RadioGroup
+              onChange={(e) => {
+                this.onTypeChange(e)
+              }}
+              disabled={true}
+              value={this.state.model.product_type}>
+              <RadioButton value={1}>直充</RadioButton>
+              <RadioButton value={2}>卡密</RadioButton>
+            </RadioGroup>
+          </FormItem>
           <FormItem labelname='映射商品' prop='product' id='product'>
             <Select
               options={this.state.productOption}
@@ -587,17 +598,6 @@ export default class adduserinfo extends React.Component {
               }}
             />
           </FormItem>
-          <FormItem labelname='商品类型' prop='type' id='type'>
-            <RadioGroup
-              onChange={(e) => {
-                this.onTypeChange(e)
-              }}
-              disabled={true}
-              value={this.state.model.product_type}>
-              <RadioButton value={1}>直充</RadioButton>
-              <RadioButton value={2}>卡密</RadioButton>
-            </RadioGroup>
-          </FormItem>
           <FormItem labelname='预估成本价' prop='cost_price' id='cost_price'>
             <div className='line-value'>{this.state.model.cost_price}</div>
           </FormItem>