Merge branch 'dev/v2.4.37_wmh' of jianyu/qmx_page_admin into feature/v2.4.37

src/views/order/components/bigOrder.vue

@@ -55,8 +55,8 @@
                 <FormItem label="付费类型" required>
                     <RadioGroup v-model="member.recordPayType" @on-change="recordPayTypeChange">
                         <Radio label="1" :disabled="newpayDis || paytypeAlldis">购买</Radio>
-                        <Radio label="2" :disabled="paytypeAlldis">续费</Radio>
-                        <Radio label="3" :disabled="paytypeAlldis">升级</Radio>
+                        <Radio label="2" :disabled="paytypeAlldis || !newpayDis">续费</Radio>
+                        <Radio label="3" :disabled="paytypeAlldis || !newpayDis">升级</Radio>
                         <Radio label="4" :disabled="newpayDis || paytypeAlldis">试用</Radio>
                     </RadioGroup>
                 </FormItem>

src/views/order/components/bigOrderEdit.vue

@@ -64,8 +64,8 @@
           <FormItem label="付费类型" required>
                     <RadioGroup v-model="member.recordPayType" @on-change="recordPayTypeChange">
                         <Radio label="1" :disabled="newpayDis || paytypeAlldis || member.order_status == '1' || pass_all_incomplete_dis">购买</Radio>
-                        <Radio label="2" :disabled="paytypeAlldis || member.order_status == '1' || pass_all_incomplete_dis">续费</Radio>
-                        <Radio label="3" :disabled="paytypeAlldis || member.order_status == '1' || pass_all_incomplete_dis">升级</Radio>
+                        <Radio label="2" :disabled="paytypeAlldis || member.order_status == '1' || pass_all_incomplete_dis || !newpayDis">续费</Radio>
+                        <Radio label="3" :disabled="paytypeAlldis || member.order_status == '1' || pass_all_incomplete_dis || !newpayDis">升级</Radio>
                         <Radio label="4" :disabled="newpayDis || paytypeAlldis || member.order_status == '1' || pass_all_incomplete_dis">试用</Radio>
                     </RadioGroup>
             </FormItem>