Merge remote-tracking branch 'origin/master'

src/views/school-center/order/order.vue

@@ -304,7 +304,7 @@
                 <div>
                   <a-button v-show="orderInfo.orderStatus == '待配送'" @click="openKD" type="primary">填写快递单号</a-button>
                   <a-button v-show="orderInfo.sendType == null || orderInfo.sendType == ''" @click="openConfigSendType()" type="primary">配送方式</a-button>
-                  <a-button v-show="orderInfo.businessIccid == null || orderInfo.businessIccid == ''" @click="openConfigIccidFun" type="primary">配置iccid</a-button>
+                  <a-button v-show="(orderInfo.sendType != null && orderInfo.sendType != '') && (orderInfo.businessIccid == null || orderInfo.businessIccid == '')" @click="openConfigIccidFun" type="primary">配置iccid</a-button>
                   <a-button @click="showReview()" type="primary">审核学生证</a-button>
                   <a-button v-show="orderInfo.userType == '1' && orderInfo.orderStatus == '待受理'" @click="showUpgrade" type="primary">存量升级受理</a-button>
                 </div>