no message

src/views/mallManagement/goods/goods_add/index.vue

@@ -887,7 +887,7 @@ export default {
                 if(!this.specList[i].mainId)  return this.$errorMsg('请选择大类')
                 if(!this.specList[i].smallId)  return this.$errorMsg('请选择小类')
                 if(!this.specList[i].specValue)  return this.$errorMsg('请填写规格名称')
-                if(!this.specList[i].goodsCode)  return this.$errorMsg('请选择规格型号')
+                if(!this.specList[i].goodsCode && this.joinCode != 'NO')  return this.$errorMsg('请选择规格型号')
                 if(!this.specList[i].price)  return this.$errorMsg('请填写销售价格')
                 if(!this.specList[i].orgPrice)  return this.$errorMsg('请填写划线价格')
                 if(!this.specList[i].shareAmount)  return this.$errorMsg('请填写佣金')

src/views/mallManagement/order/order_detail/index.vue

@@ -273,7 +273,7 @@
 			 <!-- <el-button v-if="!~['TIMEOUT', 'CLOSE'].indexOf(orderDetail.orderStatus)" size="mini" type="text"
 			    @click="handleRefund(scope.row)" :disabled="!orderDetail.refundAble || scope.row.refundNum >= scope.row.num">退款
 			  </el-button> -->
-              <el-button type="text" size="small" @click="returnOrder(scope.row.deliveryId)">发起退货</el-button>
+              <el-button type="text" size="small" @click="returnOrder(scope.row.deliveryId)" v-if="!~['TIMEOUT', 'CLOSE'].indexOf(orderDetail.orderStatus) || scope.row.status != 'REFUND'">发起退货</el-button>
             </template>
           </el-table-column>
         </el-table>