Merge remote-tracking branch 'origin/dev' into test

src/pages/order/complete.vue

@@ -529,7 +529,7 @@
 				// 更新预计超出金额
 				let amount = this.calMaterialCraftListAmount(this.form.materialList)
 				amount += this.calMaterialCraftListAmount(this.form.craftList)
-				this.$set(this.form,'overAmount',amount)
+				this.$set(this.form,'allExtraAmt',amount)
 			},
             // 字段的值更新
             fieldValueChange(data) {
@@ -628,7 +628,7 @@
 				let self = this
 				let param = {"partnerCompanyId":this.partnerCompanyId,
 					"categoryId":this.categoryId,
-					"brandId":this.brandId,
+					"brandId":this.brandId || '',
 					"fieldName":this.photoItem.fieldsName}
 				this.$u.api.orderStandardItem(param).then((res)=>{
 					if (res.code == 200 && res.data.length>0) {