修改创建订单时的价格显示

src/components/SelectModal/ForSelTable.js

@@ -36,7 +36,7 @@ export default class ForSelTable extends PureComponent {
       render: (text, record) => (
         <Button
           onClick={() => onAdd(record)}
-          disabled={selected.filter(item => item.id === record.id).length}
+          disabled={selected.filter(item => item.id === record.id).length || record.selectable}
           size="small"
           type="primary"
         >

src/models/mproduct/detail.js

@@ -35,7 +35,7 @@ export default {
       yield put({ type: 'changeLoading', payload: { itemLoading: true } });
       const { data, success } = yield call(queryOne, payload);
       if (success) {
-        yield put({ type: 'querySuccess', payload: { ...data } });
+        yield put({ type: 'querySuccess', payload: { currentItem: data } });
       }
       yield put({ type: 'changeLoading', payload: { itemLoading: false } });
     },

src/routes/MProduct/View/index.js

@@ -357,11 +357,11 @@ export default class MerchantProductEdit extends PureComponent {
         dataIndex: 'chargeUnit',
         key: 'chargeUnit',
       }, {
-        title: '渠道售卖价格(¥)',
+        title: '实际售价(¥)',
         dataIndex: 'merchantPrice',
         key: 'merchantPrice',
       }, {
-        title: '终端显示价格(¥)',
+        title: '终端显示(¥)',
         dataIndex: 'terminalPrice',
         key: 'terminalPrice',
       }],
@@ -384,7 +384,7 @@ export default class MerchantProductEdit extends PureComponent {
         </Card>
         <Card
           bordered={false}
-          title="已上架标签"
+          title="已上架栏目"
           style={{ marginBottom: 15 }}
         >
           {tags ? tags.map(item => <Tag key={item.id} color="#f50">{item.name}</Tag>) : null}

src/routes/Order/Add/index.js

@@ -455,17 +455,17 @@ export default class CreateOrder extends Component {
       },
       width: '13%',
     }, {
-      title: '供应商售价(¥)',
-      dataIndex: 'price1',
-      key: 5,
-      width: '10%',
-    }, {
-      title: '领教售价(¥)',
+    //   title: '供应商售价(¥)',
+    //   dataIndex: 'price1',
+    //   key: 5,
+    //   width: '10%',
+    // }, {
+      title: '实际售价(¥)',
       dataIndex: 'price2',
       key: 6,
       width: '10%',
     }, {
-      title: '渠道售价(¥)',
+      title: '终端显示(¥)',
       dataIndex: 'price3',
       key: 7,
       width: '10%',