Merge remote-tracking branch 'origin/bww-v1'

src/pages/newtheme/customsclock/Unclock.js

@@ -347,7 +347,7 @@ class UnClockForm extends React.Component {
                 },
               ],
             })(
-              <InputNumber min={0} style={{ width: 100 }} />,
+              <InputNumber min={1} style={{ width: 100 }} />,
             )}
             <span className="ant-form-text">关卡</span>
           </FormItem>
@@ -362,7 +362,7 @@ class UnClockForm extends React.Component {
                 },
               ],
             })(
-              <InputNumber min={0} max={99} style={{ width: 100 }} />,
+              <InputNumber min={1} max={99} style={{ width: 100 }} />,
             )}
             <span className="ant-form-text">次</span>
           </FormItem>
@@ -431,6 +431,32 @@ class UnClockForm extends React.Component {
             )}
             <span className="ant-form-text1">&nbsp;&nbsp;&nbsp;开启后，收集学员姓名和电话等信息</span>
           </FormItem>
+          {getFieldValue('sign_up_status') === true ?
+            <div>
+              <FormItem {...formItemModaltypeLayout} label="&nbsp;" colon={false}>
+                {radioList.length > 0 &&
+                <div className={pageStyle.infoBox}>
+                  <Input style={{ width: 200 }} value={radioname} maxLength={30} onChange={e => this.changeRadioName(e)} placeholder="请输入单选项问题" />
+                  <div className={pageStyle.deleteInput} onClick={this.deleteRadioName}>删除</div>
+                </div>
+                }
+                {radioList.length > 0 && radioList.map((item, index) =>
+                  (
+                    <div key={index} className={pageStyle.infoInputItem}>
+                      <span>{item.text}：</span>
+                      <Input style={{ width: 200 }} value={item.name} maxLength={30} placeholder="输入内容" onChange={e => this.changeInputName(e, index)} />
+                      <div className={pageStyle.deleteInput} onClick={() => this.deleteInputName(index)}><Icon type="minus-circle" /></div>
+                    </div>
+                  ),
+                )
+                }
+                {radioList.length > 0 && radioList.length <= 4 && <div className={pageStyle.addRadio} onClick={this.addCheckItem}>添加选项</div>}
+                {radioList.length == 0 && <div className={pageStyle.addRadio} onClick={this.addRadio}>添加自定义单选项</div>}
+              </FormItem>
+            </div>
+            : (
+              ''
+            )}
           <FormItem {...formItemModalLineLayout} label="页面设置" className={pageStyle.imgFormItem}>
             <div className={pageStyle.photoWrap}>
               <div className={pageStyle.photoCover}>
@@ -452,32 +478,6 @@ class UnClockForm extends React.Component {
             </div>
             <span className="ant-form-text">图片建议格式位JPG/PNG，尺寸750*422</span>
           </FormItem>
-          {getFieldValue('sign_up_status') === true ?
-            <div>
-              <FormItem {...formItemModaltypeLayout} label="&nbsp;" colon={false}>
-                {radioList.length > 0 &&
-                <div className={pageStyle.infoBox}>
-                  <Input style={{ width: 200 }} value={radioname} maxLength={30} onChange={e => this.changeRadioName(e)} placeholder="请输入单选项问题" />
-                  <div className={pageStyle.deleteInput} onClick={this.deleteRadioName}>删除</div>
-                </div>
-              }
-                {radioList.length > 0 && radioList.map((item, index) =>
-                (
-                  <div key={index} className={pageStyle.infoInputItem}>
-                    <span>{item.text}：</span>
-                    <Input style={{ width: 200 }} value={item.name} maxLength={30} placeholder="输入内容" onChange={e => this.changeInputName(e, index)} />
-                    <div className={pageStyle.deleteInput} onClick={() => this.deleteInputName(index)}><Icon type="minus-circle" /></div>
-                  </div>
-                ),
-                )
-              }
-                {radioList.length > 0 && radioList.length <= 4 && <div className={pageStyle.addRadio} onClick={this.addCheckItem}>添加选项</div>}
-                {radioList.length == 0 && <div className={pageStyle.addRadio} onClick={this.addRadio}>添加自定义单选项</div>}
-              </FormItem>
-            </div>
-            : (
-            ''
-          )}
           <FormItem {...formItemModaltypeLayout} label="闯关介绍">
             <div className={pageStyle.introduceWrap}>
               <ThemeEditor