张延森 5 年之前
父節點
當前提交
77bc61bffb
共有 3 個檔案被更改,包括 14 行新增7 行删除
  1. 1
    1
      config/dev.js
  2. 1
    1
      config/prod.js
  3. 12
    5
      src/onlineSelling/pages/raiseMoney/index.js

+ 1
- 1
config/dev.js 查看文件

15
     WSS_HOST: '"ws://192.168.2.52:8080"',
15
     WSS_HOST: '"ws://192.168.2.52:8080"',
16
     OSS_PATH: 'https://njcj.oss-cn-shanghai.aliyuncs.com/',
16
     OSS_PATH: 'https://njcj.oss-cn-shanghai.aliyuncs.com/',
17
     OSS_FAST_PATH: 'https://njcj.oss-accelerate.aliyuncs.com/',
17
     OSS_FAST_PATH: 'https://njcj.oss-accelerate.aliyuncs.com/',
18
-    Version: 'V3.5.12'
18
+    Version: 'V3.5.13'
19
   },
19
   },
20
   weapp: {},
20
   weapp: {},
21
   h5: {}
21
   h5: {}

+ 1
- 1
config/prod.js 查看文件

11
     // WSS_HOST: '"wss://lt.pawoma.cn"',
11
     // WSS_HOST: '"wss://lt.pawoma.cn"',
12
     OSS_PATH: 'https://njcj.oss-cn-shanghai.aliyuncs.com/',
12
     OSS_PATH: 'https://njcj.oss-cn-shanghai.aliyuncs.com/',
13
     OSS_FAST_PATH: 'https://njcj.oss-accelerate.aliyuncs.com/',
13
     OSS_FAST_PATH: 'https://njcj.oss-accelerate.aliyuncs.com/',
14
-    Version: 'V3.5.12'
14
+    Version: 'V3.5.13'
15
   },
15
   },
16
   weapp: {},
16
   weapp: {},
17
   h5: {}
17
   h5: {}

+ 12
- 5
src/onlineSelling/pages/raiseMoney/index.js 查看文件

598
   }
598
   }
599
 
599
 
600
   makePay = () => {
600
   makePay = () => {
601
-    this.setState({
602
-      payClick: false
603
-    })
604
     const { payType, record = {} } = this.state
601
     const { payType, record = {} } = this.state
605
     if (!payType) {
602
     if (!payType) {
606
       Taro.showToast({
603
       Taro.showToast({
708
   }
705
   }
709
 
706
 
710
   nextStep(current) {
707
   nextStep(current) {
708
+    const { payClick } = this.state
709
+    if (!payClick) return;
710
+
711
     // 缴费的下一步
711
     // 缴费的下一步
712
     if (current > 3) {
712
     if (current > 3) {
713
       this.setState({
713
       this.setState({
744
 
744
 
745
         // 缴费
745
         // 缴费
746
         case 3:
746
         case 3:
747
+          this.setState({
748
+            payClick: false
749
+          })
750
+
747
           this.makePay().then(() => {
751
           this.makePay().then(() => {
748
 
752
 
749
             this.setState({
753
             this.setState({
750
               payClick: true,
754
               payClick: true,
751
               current: current + 1
755
               current: current + 1
752
             })
756
             })
757
+          }).catch(() => {
758
+            this.setState({ payClick: true })
753
           })
759
           })
760
+
754
           return;
761
           return;
755
 
762
 
756
         //
763
         //
771
   }
778
   }
772
 
779
 
773
   renderBottomBtn() {
780
   renderBottomBtn() {
774
-    const { current, protocolCountdown, payClick } = this.state
781
+    const { current, protocolCountdown } = this.state
775
     const { payType } = this.state
782
     const { payType } = this.state
776
     return (
783
     return (
777
       <View className="bottom-btn">
784
       <View className="bottom-btn">
779
         {current != 4 &&
786
         {current != 4 &&
780
           <NextStep
787
           <NextStep
781
             countdown={current == 1 ? protocolCountdown : 0}
788
             countdown={current == 1 ? protocolCountdown : 0}
782
-            onClick={() => payClick ? this.nextStep(current) : ''}
789
+            onClick={() => this.nextStep(current)}
783
             text={current == 3 && payType === 'onLine' ? '现在缴费' : '下一步'}
790
             text={current == 3 && payType === 'onLine' ? '现在缴费' : '下一步'}
784
           />
791
           />
785
         }
792
         }