Merge branch 'dev'

src/pages/order/complete.vue

@@ -44,7 +44,7 @@
                                                 @value-change="fieldValueChange">
                                             </xh-select>
                                             <view v-else-if="item.formType==='file'">
-                                                 <xh-files 
+                                                 <xh-files
                                                     :ref="`fileChild${itemIndex}`"
                                                     :groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :partnerCompanyId="partnerCompanyId" :categoryId="categoryId" :value='form[item.fieldsName] || []'
                                                     @value-change="fieldValueChange">
@@ -53,9 +53,9 @@
                                                             <u-image class="pic" width="160rpx" height="160rpx" :border-radius="10" @click="selectUpload(JSON.stringify(item), groupIndex, itemIndex)" :src="uploadImage"></u-image>
                                                         </view>
                                                     </template>
-                                                </xh-files> 
-                                            </view>     
-                                           
+                                                </xh-files>
+                                            </view>
+
                                             <xh-location v-else-if="item.formType==='location'"
                                                 :groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""'
                                                 @value-change="fieldValueChange">
@@ -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) {
@@ -624,11 +624,11 @@
 				this.getWatermark()
 			},
             // 获取拍照规范
-            photograph(){ 
+            photograph(){
 				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) {
@@ -640,7 +640,7 @@
 				})
 			},
             // 获取水印
-			getWatermark(){ 
+			getWatermark(){
 				if(getApp().globalData.photo.waterSetting){
 					return
 				}
@@ -654,7 +654,7 @@
 				});
 			},
             // ------------------------- 以上方法为上传组件相关 -------------------------
-            
+
             // ------------------------- 以下方法为展示滚动切换 -------------------------
             // 点击左边的栏目切换
             async swichMenu(index) {