Merge branch 'master' into dev

.env.js

@@ -12,11 +12,8 @@
 		}
 
 	} else if (process.env.NODE_ENV === "production") {
-		if (NODE_ENV === 'test') {
+		// ENV_VAR = require('./.env.prod.js');
 		ENV_VAR = require('./.env.test.js');
-		} else if (NODE_ENV === 'prod') {
-			ENV_VAR = require('./.env.prod.js');
-		}
 	}
 	if (ENV_VAR) {
 		process.uniEnv = {};

src/pages/order/complete.vue

@@ -533,7 +533,7 @@
 				// 更新预计超出金额
 				let amount = this.calMaterialCraftListAmount(this.form.materialList)
 				amount += this.calMaterialCraftListAmount(this.form.craftList)
-				this.$set(this.form,'allExtraAmt',amount)
+				this.$set(this.form,'overAmount',amount)
 			},
             // 字段的值更新
             fieldValueChange(data) {