修复：酒道馆进货商品列表 搜索无效

修复：酒道馆进货订单列表 点击订单详情如果出现错误则会跳转到用户订单列表而不是返回酒道馆进货订单列表
修复：酒道馆进货订单支付结果页面 点击查看信息跳转的是用户订单列表而不是酒道馆进货列表

components/orderGoods/index.vue

@@ -158,6 +158,8 @@
 				}
 			},
 			jumpCon:function(item){
+        if(item.product_type == 35) return false;
+
 				if(item.product_type == 4)item.activity_id = item.cart_info && item.cart_info.activeSku.product_group_id
 				if(item.product_type == 3)item.activity_id = item.cart_info && item.cart_info.productAssistAttr.product_assist_id
 				goShopDetail(item).then(res => {

pages/order_details/index.vue

@@ -487,7 +487,7 @@
 			},
 			// 返回店铺首页
 			goStore(mer_id){
-				if(this.hide_mer_status != 1){
+				if(this.hide_mer_status != 1 && this.orderInfo.activity_type != 35 && this.orderInfo.activity_type != 36){
 					uni.navigateTo({
 						url: '/pages/store/home/index?id=' + mer_id
 					})
@@ -747,7 +747,10 @@
 					uni.hideLoading();
 					that.$util.Tips({
 						title: err
-					}, '/pages/users/order_list/index');
+					}, {
+            tab: 3,
+            url: 1
+          });
 				});
 			},
 			qrR(res) {

pages/order_pay_status/index.vue

@@ -210,6 +210,11 @@
 			 */
 			goOrderDetails: function(e) {
 				let that = this;
+        if(that.order_pay_info.activity_type == 35){
+          uni.navigateTo({
+            url: '/pages/users/order_list/index?is_with_goods=1'
+          });
+        }else{
           if(that.order_type == 20){
             uni.navigateTo({
               url: '/pages/points_mall/exchange_record?delte=1'
@@ -228,6 +233,7 @@
                 url: '/pages/users/order_list/index?status=1'
               })
             }
+          }
         }
 			}
 		},

pages/supplier/stock/with_goods.vue

@@ -5,7 +5,7 @@
       <!--顶部搜索-->
       <view class="search-content">
         <view class="search-main">
-          <input class="search-input" type="text" placeholder="请输入商品名称...">
+          <input class="search-input" v-model="search.store_name" type="text" placeholder="请输入商品名称...">
           <view class="search-btn" @click="getGoodsList(1)">搜索</view>
         </view>
       </view>
@@ -263,12 +263,17 @@ export default {
       if(Number(page) > 0) params.page = page;
       // 数据查询
       supplierGoodsList(params).then(res => {
+        let oldList = Object.assign({}, _this.list);
+        // 判断：如果是第一页  则数据重置
+        if(params.page == 1) oldList = [];
+        // 数据合并
         let list = res.data.list || {};
         if (Object.values(list).length > 0) {
-          _this.list = _this.$util.SplitArray(list, _this.list);
+          oldList = _this.$util.SplitArray(list, oldList);
-          _this.$set(_this, 'list', _this.list);
           _this.search.page++;
         }
+
+        _this.$set(_this, 'list', oldList);
       }).catch(err => {
         this.$util.Tips({title: err});
       });