fix by huangtao

@@ -40,7 +40,9 @@ export default {
   name: 'BuyOrderConfirm',
   name: 'BuyOrderConfirm',
   props: ['productId', 'storageId'],
   props: ['productId', 'storageId'],
   data() {
   data() {
-    return {};
+    return {
+      isActive: false
+    };
   },
   },
   components: {
   components: {
     ProductInfo,
     ProductInfo,
@@ -54,6 +56,10 @@ export default {
   },
   },
   activated() {
   activated() {
     this.init();
     this.init();
+    this.isActive = true;
+  },
+  deactivated() {
+    this.isActive = false;
   },
   },
   beforeRouteLeave(to, from, next) {
   beforeRouteLeave(to, from, next) {
     if (to.name !== 'address') {
     if (to.name !== 'address') {
@@ -85,7 +91,9 @@ export default {
   watch: {
   watch: {
     address: {
     address: {
       handler() {
       handler() {
-        this.compute();
+        if (this.isActive) {
+          this.compute();
+        }
       },
       },
       deep: true
       deep: true
     }
     }

@@ -7,7 +7,7 @@
     </div>
     </div>
     <div class="num-wrapper" v-if="superSell">
     <div class="num-wrapper" v-if="superSell">
      <i class="iconfont iconplus-minus icon-class" @click="onMinus"></i>
      <i class="iconfont iconplus-minus icon-class" @click="onMinus"></i>
-     <span class="icon-class count">{{count}}</span>
+     <span class="icon-class count">{{num}}</span>
      <i class="iconfont iconi-add icon-class" @click="onAdd"></i>
      <i class="iconfont iconi-add icon-class" @click="onAdd"></i>
    </div>
    </div>
   </div>
   </div>
@@ -32,8 +32,7 @@ export default {
   },
   },
   data() {
   data() {
     return {
     return {
-      val: this.value,
-      count: this.num
+      val: this.value
     };
     };
   },
   },
   methods: {
   methods: {
@@ -44,20 +43,22 @@ export default {
       this.$emit('input', this.$refs.input.value);
       this.$emit('input', this.$refs.input.value);
     },
     },
     onMinus() {
     onMinus() {
-      if (this.count > 1) {
-        this.count -= 1;
-        this.$emit('on-num-change', this.count);
+      if (this.num > 1) {
+        const count = this.num - 1;
+
+        this.$emit('on-num-change', { count, type: 'minus' });
       }
       }
     },
     },
     onAdd() {
     onAdd() {
-      this.count += 1;
-      this.$emit('on-num-change', this.count);
+      const count = this.num + 1;
+
+      this.$emit('on-num-change', { count, type: 'add' });
     }
     }
   },
   },
   watch: {
   watch: {
     value(newVal) {
     value(newVal) {
       this.val = newVal;
       this.val = newVal;
-    }
+    },
   }
   }
 };
 };
 </script>
 </script>

@@ -21,9 +21,6 @@ export default {
       default() {
       default() {
         return {};
         return {};
       }
       }
-    },
-    priceType: {
-      type: String,
     }
     }
   }
   }
 };
 };

@@ -31,7 +31,7 @@ import OrderMargin from './components/confirm/order-margin';
 import OrderFee from './components/confirm/order-fee';
 import OrderFee from './components/confirm/order-fee';
 import OrderAgree from './components/confirm/agree';
 import OrderAgree from './components/confirm/agree';
 import { Types, UserType } from 'store/order/order-confirm';
 import { Types, UserType } from 'store/order/order-confirm';
-import { get, inRange } from 'lodash';
+import { get } from 'lodash';
 
 
 import { createNamespacedHelpers, mapState } from 'vuex';
 import { createNamespacedHelpers, mapState } from 'vuex';
 
 
@@ -56,6 +56,7 @@ export default {
       agreeDesc: '有货卖家协议',
       agreeDesc: '有货卖家协议',
       url: 'https://activity.yoho.cn/feature/6773.html?share_id=9479&title=%E9%97%B2%E9%B1%BC%E6%BD%AE%E5%8D%96%E5%AE%B6%E5%8D%8F%E8%AE%AE',
       url: 'https://activity.yoho.cn/feature/6773.html?share_id=9479&title=%E9%97%B2%E9%B1%BC%E6%BD%AE%E5%8D%96%E5%AE%B6%E5%8D%8F%E8%AE%AE',
       superSell: false,
       superSell: false,
+      addNumError: false
     };
     };
   },
   },
   activated() {
   activated() {
@@ -111,13 +112,15 @@ export default {
           productName: get(state.product.selectedProductInfo, 'product.product_name', ''),
           productName: get(state.product.selectedProductInfo, 'product.product_name', ''),
           colorName: get(state.product.selectedProductInfo, 'product.goods_list[0].color_name', ''),
           colorName: get(state.product.selectedProductInfo, 'product.goods_list[0].color_name', ''),
           sizeName: get(state.product.selectedProductInfo, 'size.size_name', ''),
           sizeName: get(state.product.selectedProductInfo, 'size.size_name', ''),
+          skup: get(state.product.selectedProductInfo, 'size.skup', ''),
           goodPrice,
           goodPrice,
           priceType,
           priceType,
           goodBidPrice,
           goodBidPrice,
           priceBidType,
           priceBidType,
           isSuggest: suggestHighPrice && suggestLowPrice,
           isSuggest: suggestHighPrice && suggestLowPrice,
           suggestHighPrice,
           suggestHighPrice,
-          suggestLowPrice
+          suggestLowPrice,
+          bidPrice
         };
         };
       }
       }
     })
     })
@@ -130,6 +133,34 @@ export default {
       this.submit();
       this.submit();
     },
     },
     compute() {
     compute() {
+      if (this.productDetail.bidPrice && (Number(this.price) >= this.productDetail.bidPrice)) {
+        this.$createDialog({
+          type: 'confirm',
+          title: `最高求购价${this.productDetail.bidPrice}`,
+          content: '已有求购高于您的出价，可直接变现',
+          confirmBtn: {
+            text: '我再想想',
+            active: true,
+            disabled: false,
+          },
+          cancelBtn: {
+            text: '确定变现',
+            active: false,
+            disabled: false
+          },
+          onCancel: () => {
+            this.$router.replace({
+              name: 'sellAskOrder',
+              query: {
+                skup: this.productDetail.skup,
+                price: this.productDetail.bidPrice
+              }
+            });
+          }
+        }).show();
+        return;
+      }
+
       return this.fetchOrderPrice({
       return this.fetchOrderPrice({
         address_id: this.address?.address_id,
         address_id: this.address?.address_id,
         num: this.num,
         num: this.num,
@@ -138,14 +169,21 @@ export default {
       }).then(result => {
       }).then(result => {
         if (result.error) {
         if (result.error) {
           this.error = result.error;
           this.error = result.error;
+
           this.$createToast({
           this.$createToast({
             time: 1500,
             time: 1500,
             txt: result.error,
             txt: result.error,
             type: 'txt'
             type: 'txt'
           }).show();
           }).show();
+
+          if (result.code === 438) {
+            this.addNumError = true;
+          }
+
           return;
           return;
         }
         }
         this.error = false;
         this.error = false;
+        this.addNumError = false;
       });
       });
     },
     },
     changePrice(val) {
     changePrice(val) {
@@ -276,7 +314,12 @@ export default {
         }
         }
       });
       });
     },
     },
-    onNumChange(count) {
+    onNumChange({ count, type }) {
+      console.log(count, type, this.addNumError);
+      if (type === 'add' && this.addNumError) {
+        return;
+      }
+
       this[Types.CHANGE_SELL_NUM](count);
       this[Types.CHANGE_SELL_NUM](count);
       this.compute();
       this.compute();
     },
     },

@@ -31,6 +31,7 @@ export default function() {
   return {
   return {
     namespaced: true,
     namespaced: true,
     state: {
     state: {
+      buyAddress: null,
       address: null,
       address: null,
       fee: {
       fee: {
         income: '',
         income: '',
@@ -200,6 +201,7 @@ export default function() {
 
 
         if (order.code !== 200) {
         if (order.code !== 200) {
           return {
           return {
+            code: order.code,
             error: order.message
             error: order.message
           };
           };
         }
         }