Merge branch 'master-3.1.1bug' into test

src/views/system/freight/freight_list/templateFreight.vue

@@ -721,7 +721,7 @@
         let isContinue = true
         if (this.deliveryTableData.length) {
           for(let i = 0; i < this.deliveryTableData.length; i++) {
-            if (!this.deliveryTableData[i].a.length || !this.deliveryTableData[i].f || !this.deliveryTableData[i].fp || !this.deliveryTableData[i].n || !this.deliveryTableData[i].np) {
+            if (!this.deliveryTableData[i].a.length || !String(this.deliveryTableData[i].f) || !String(this.deliveryTableData[i].fp) || !String(this.deliveryTableData[i].n) || !String(this.deliveryTableData[i].np)) {
               isContinue = false
             }
           }

src/views/system/goods/add/components/goodsaftersale.vue

@@ -72,7 +72,7 @@
         <el-select v-model="goodsAfterSaleForm.aftersale_time" style="width:400px;" placeholder="请选择售后时长">
           <el-option label="7天" :value="7"></el-option>
           <el-option label="15天" :value="15"></el-option>
-          <el-option label="30天" :value="30"></el-option>
+          <!-- <el-option label="30天" :value="30"></el-option> -->
         </el-select>
       </el-form-item>