Merge branch 'master' of git.quantgroup.cn:ui/merchant-manage-ui into feature/commodity-properties

src/components/GaoDeMap/index.jsx

@@ -38,7 +38,9 @@ export default props => {
       geocoder.getLocation(addrInfo.address, (status, result) => {
         if (status === 'complete' && result.geocodes.length) {
           const { lng, lat } = result.geocodes[0].location;
+          console.log(result.geocodes[0].location);
           setLnglat([lng, lat]);
+          setLnglatText(`${lng},${lat}`);
         } else {
           console.error('根据地址查询位置失败');
           // setLnglat([116.397561,39.909063])

src/pages/chainStoreManage/components/storeModal.jsx

@@ -81,6 +81,12 @@ const StoreModal = props => {
     const values = getFieldsValue();
     let provice = '北京市';
     if (!values.addr) {
+      notification.warning({ message: '请先选择店铺区域' });
+      return;
+    }
+
+    if (!values.address) {
+      notification.warning({ message: '请先填写完整的详细地址' });
       return;
     }
     if (values.addr.length > 0) {
@@ -280,7 +286,7 @@ const StoreModal = props => {
           {getFieldDecorator('address', {
             rules: [{ required: true, message: '请输入详细地址!' }],
             initialValue: formData.address,
-          })(<Input placeholder="请输入详细地址" allowClear maxLength={100} />)}
+          })(<Input placeholder="请输入详细地址" allowClear maxLength={50} />)}
         </FormItem>
         <FormItem label="经纬度">
           {getFieldDecorator('lnglat', {

src/pages/orderManage/queryOrder/index.jsx

@@ -252,7 +252,7 @@ const OrderList = props => {
       dataIndex: 'receiverName',
       rowSpanMode: 'auto',
       width: 150,
-      render: ({ value, record }) => `${value}/${record.receiverMobile}`,
+      render: ({ value, record }) => `${value || '-'}/${record.receiverMobile || '-'}`,
     },
     {
       title: '付款金额（元）',