Merge branch 'develop' into test

config/index.js

@@ -34,7 +34,9 @@ const config = {
   },
   defineConstants: {},
   copy: {
-    patterns: [],
+    patterns: [
+      {from: 'sitemap.json', to: 'dist/sitemap.json'}
+    ],
     options: {},
   },
   weapp: {

sitemap.json

+{
+  "rules": {
+    "action": "disallow",
+    "page": "*"
+  }
+}

src/api/area.ts

@@ -8,5 +8,5 @@ export type Area = {
 
 export const fetchAllArea = (): Promise<ResponseDataEntity<Area[]>> =>
   baseFetch({
-    url: '/area/queryAreaList',
+    url: '/area/queryAccessAreaList',
   });

src/pages/Order/components/OrderPayway/OrderPayway.tsx

@@ -241,10 +241,10 @@ class OrderPayway extends Component {
       <View className='OrderPayway'>
         {prePay ? (
           payInfoList.length ? (
-            payInfoList.map((payway, index) =>
+            payInfoList.map(payway =>
               payway.payType === '2' ? (
                 <View
-                  key={index}
+                  key={payway.payType}
                   className='OrderPay-payway'
                   onClick={() => this.changePayWay(payway)}>
                   <Image className='OrderPay-icon' src={payWayWxLogo} />
@@ -261,7 +261,7 @@ class OrderPayway extends Component {
                 </View>
               ) : payway.payType === '6' ? (
                 <View
-                  key={index}
+                  key={payway.payType}
                   className={`OrderPay-payway ${useAmi ? '' : 'disabled'}`}
                   onClick={() => this.changePayWay(payway, !useAmi)}>
                   <Image className='OrderPay-icon' src={payWayAimiLogo} />
@@ -282,7 +282,7 @@ class OrderPayway extends Component {
                 </View>
               ) : payway.payType === '7' ? (
                 <View
-                  key={index}
+                  key={payway.payType}
                   className={`OrderPay-payway ${useBean ? '' : 'disabled'}`}
                   onClick={() => this.changePayWay(payway, !useBean)}>
                   <Image className='OrderPay-icon' src={payWayHairLogo} />
@@ -303,7 +303,7 @@ class OrderPayway extends Component {
                 </View>
               ) : payway.payType === '8' ? (
                 <View
-                  key={index}
+                  key={payway.payType}
                   className={`OrderPay-payway ${useCom ? '' : 'disabled'}`}
                   onClick={() => this.changePayWay(payway, !useCom)}>
                   <Image className='OrderPay-icon' src={payWayComLogo} />