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

src/layouts/components/RightContent.tsx

@@ -28,29 +28,29 @@ const GlobalHeaderRight: React.SFC<{}> = (props) => {
   return (
     <div className={className}>
       <Link to='/' style={{color: 'rgba(0, 0, 0, 0.85)'}}>返回商城</Link>
-        <Roles />
-        <Location />
-        <SelectLang />
-        <Tooltip title="消息">
-          <a
-            target="_blank"
-            href=""
-            rel="noopener noreferrer"
-            className={styles.action}
-          >
-            <BellOutlined />
-          </a>
-        </Tooltip>
-        <Tooltip title="服务">
-          <a
-            target="_blank"
-            href=""
-            rel="noopener noreferrer"
-            className={styles.action}
-          >
-            <CustomerServiceOutlined />
-          </a>
-        </Tooltip>
+      <Roles />
+      <Location />
+      <SelectLang />
+      <Tooltip title="消息">
+        <a
+          target="_blank"
+          href=""
+          rel="noopener noreferrer"
+          className={styles.action}
+        >
+          <BellOutlined />
+        </a>
+      </Tooltip>
+      <Tooltip title="服务">
+        <a
+          target="_blank"
+          href=""
+          rel="noopener noreferrer"
+          className={styles.action}
+        >
+          <CustomerServiceOutlined />
+        </a>
+      </Tooltip>
       <Avatar />
     </div>
   );

src/pages/lxMall/commodityDetail/index.tsx

@@ -451,7 +451,8 @@ const CommodityDetail = (props) => {
     if (clickFlag) {
       clickFlag = false
 
-      PublicApi.postOrderDirectPayment({ productId: selectCommodityId }).then(res => {
+      //@ts-ignore
+      PublicApi.postOrderDirectPayment({ productId: selectCommodityId, memberId }).then(res => {
         if (res.code === 1000) {
           message.destroy()
           let buyCommodityInfo = {