Merge branch 'dev' into test

src/pages/Goods/Detail/index.vue

@@ -682,6 +682,12 @@ export default {
       this.optionsValue = [val.category_1_id, val.category_2_id];
       this.rulesForm.useStartTime = this.formatDate(val.rule_start_time);
       this.rulesForm.useEndTime = this.formatDate(val.rule_end_time);
+      console.log(val.original_price);
+      if (!val.original_price) {
+        this.$nextTick(() => {
+          this.goodsObj.original_price = "";
+        })
+      }
     },
     rejectVisible (val) {
       if (!val) {
@@ -1161,7 +1167,7 @@ export default {
 
     // 更改原价
     perPrice () {
-      if (!this.goodsObj.original_price) {
+      if (!this.goodsObj.original_price || this.goodsObj.original_price == 0) {
         this.$nextTick(() => {
           this.goodsObj.original_price = "";
         })