解决冲突

WXD-SEASON\season
2 parents 3f9d0c37 205555cf
Showing 25 changed files with 970 additions and 12 deletions
packageA/pages/goodsInfo/goodsInfo.js
packageA/pages/goodsInfo/goodsInfo.wxml
packageA/pages/goodsInfo/goodsInfo.wxss
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss
packageC/pages/presell/goodsInfo/goodsInfo.js
packageC/pages/presell/goodsInfo/goodsInfo.wxml
packageC/pages/presell/goodsInfo/goodsInfo.wxss
packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.js
packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.wxml
packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.wxss
packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js
packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.wxml
packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.wxss
packageE/pages/user/monthgiftbag/public/buy_com.wxml
pages/giftpack/buygiftpack/giftpackbuy.js
pages/giftpack/buygiftpack/giftpackbuy.wxss
pages/giftpack/giftpacklist/giftpacklist.js
pages/giftpack/giftpacklist/giftpacklist.wxml
@@ -11,7 +11,7 @@ var t = require(&quot;../../../utils/util.js&quot;),
  
 let self = null;
  
-//评价加载更多
+//评价加载更多 
 var more = function(e) {
       return e && e.__esModule ? e : {
         default: e
@@ -212,7 +212,9 @@ Page({
  
 		hiddenCS: true, //控制客服操作菜单显示和控制
  
-		openSpecModal_flash_normal: 0,
+    openSpecModal_flash_normal: 0,
+    keyword:'', //门店搜索
+    sec_i:-1,//选中分类门店 下标
   },
  
   //------初始化加载----------
@@ -1743,6 +1745,93 @@ Page({
       })
     }, 200)
   },
+  //获取搜索门店输入的值
+  input_store: function(e) {
+    this.setData({
+      keyword: e.detail.value
+    })
+  },
+  //搜索门店
+  searchfn(){
+    let choice_sort_store = this.data.choice_sort_store
+    if (choice_sort_store==0) {  //全局搜索
+      let all_pick_list = this.data.all_pick_list
+      let def_pickpu_list = this.data.def_pickpu_list
+      let keyword = this.data.keyword
+      if (keyword) {
+        let arr=all_pick_list.filter( item =>{
+          let i = item.pickup_name.indexOf(keyword)
+          if (i > -1) {
+            return true
+          }else{
+            return false
+          }
+        })
+        if (arr && arr.length>0) {        
+          if(this.data.is_show_sto_cat==1){
+            this.setData({
+              def_pickpu_list:arr
+            })       
+          }else{
+            this.setData({
+              only_pk:arr
+            })     
+          }
+        }else{
+          wx.showToast({
+            title: '没有搜索到门店',
+            icon: 'none',
+            duration: 2000
+          })
+        }
+      }else{
+        if (this.data.is_show_sto_cat==1) {
+          this.setData({
+            def_pickpu_list:all_pick_list.slice(0,10)
+          })       
+        }else{
+          this.setData({
+            only_pk:all_pick_list
+          })     
+        }
+
+      }
+    }else{   //分类下搜索
+      let sec_i=this.data.sec_i
+      let all_sto = this.data.all_sto
+      let sec_sto= this.data.sec_sto
+      let sec_arr = sec_sto.s_arr
+      let keyword = this.data.keyword
+      let text='sec_sto.s_arr'
+      if (keyword) {
+        let arr=sec_arr.filter( item =>{
+            let i = item.pickup_name.indexOf(keyword)
+            if (i > -1) {
+              return true
+            }else{
+              return false
+            }
+        })
+        if (arr && arr.length>0) {
+          this.setData({
+            [text]:arr
+          })                
+        }else{
+          wx.showToast({
+            title: '没有搜索到门店',
+            icon: 'none',
+            duration: 2000
+          })
+        }
+      }else{
+        this.setData({
+          [text]:all_sto[sec_i].s_arr
+        })       
+      }
+
+
+    }
+  },
  
  
   //------------处理门店---------------
@@ -806,6 +806,12 @@
 					</view>
 				</view>
 			</view>
+      <view class="searchbar flex-vertical-between storeListpadd">
+        <input class="inputstore fs28" placeholder="输入要搜索的门店" value="{{keyword}}" placeholder-class="fs28" maxlength="16" bindinput="input_store" bindconfirm="searchfn" />
+        <view class="search flex-center" bindtap="searchfn">
+          <view class="fs28">搜索</view>
+        </view>
+      </view>
 			<!-- 门店列表，最外层的门店列表，一开始 -->
 			<view class="store-list">
 				<!--如果还没有点击更多门店的时候  -->
@@ -2968,5 +2968,28 @@ button.custom-service::after{
 	left: -1000px;
 	top: -1000px;
 }
-
+ 
+.searchbar {
+  height: 95rpx;
+  border-bottom: 2rpx solid rgb(238, 238, 238);
+}
+.storeListpadd {
+  padding: 0rpx 31rpx;
+}
+.search {
+  width: 125rpx;
+  height: 45rpx;
+  line-height: 45rpx;
+  background-color: rgb(219, 27, 52);
+  border-radius: 30rpx;
+  color: rgb(255, 255, 255);
+}
+.inputstore {
+  width: 510rpx;
+  height: 43rpx;
+  line-height: 43rpx;
+  border-radius: 30rpx;
+  border: 2rpx solid rgb(238, 238, 238);
+  padding-left: 30rpx;
+}
  
@@ -285,6 +285,8 @@ Page({
  
 	hiddenCS: true,
     is_get_guide:0,
+    keyword:'', //门店搜索
+    sec_i:-1,//选中分类门店 下标
   },
  
   //------初始化加载----------
@@ -3277,7 +3279,93 @@ Page({
     }, 200)
  
   },
+  //获取搜索门店输入的值
+  input_store: function(e) {
+    this.setData({
+      keyword: e.detail.value
+    })
+  },
+  //搜索门店
+  searchfn(){
+    let choice_sort_store = this.data.choice_sort_store
+    if (choice_sort_store==0) {  //全局搜索
+      let all_pick_list = this.data.all_pick_list
+      let def_pickpu_list = this.data.def_pickpu_list
+      let keyword = this.data.keyword
+      if (keyword) {
+        let arr=all_pick_list.filter( item =>{
+          let i = item.pickup_name.indexOf(keyword)
+          if (i > -1) {
+            return true
+          }else{
+            return false
+          }
+        })
+        if (arr && arr.length>0) {        
+          if(this.data.is_show_sto_cat==1){
+            this.setData({
+              def_pickpu_list:arr
+            })       
+          }else{
+            this.setData({
+              only_pk:arr
+            })     
+          }
+        }else{
+          wx.showToast({
+            title: '没有搜索到门店',
+            icon: 'none',
+            duration: 2000
+          })
+        }
+      }else{
+        if (this.data.is_show_sto_cat==1) {
+          this.setData({
+            def_pickpu_list:all_pick_list.slice(0,10)
+          })       
+        }else{
+          this.setData({
+            only_pk:all_pick_list
+          })     
+        }
  
+      }
+    }else{   //分类下搜索
+      let sec_i=this.data.sec_i
+      let all_sto = this.data.all_sto
+      let sec_sto= this.data.sec_sto
+      let sec_arr = sec_sto.s_arr
+      let keyword = this.data.keyword
+      let text='sec_sto.s_arr'
+      if (keyword) {
+        let arr=sec_arr.filter( item =>{
+            let i = item.pickup_name.indexOf(keyword)
+            if (i > -1) {
+              return true
+            }else{
+              return false
+            }
+        })
+        if (arr && arr.length>0) {
+          this.setData({
+            [text]:arr
+          })                
+        }else{
+          wx.showToast({
+            title: '没有搜索到门店',
+            icon: 'none',
+            duration: 2000
+          })
+        }
+      }else{
+        this.setData({
+          [text]:all_sto[sec_i].s_arr
+        })       
+      }
+
+
+    }
+  },
  
   //------------处理门店---------------
   deal_pickup(e) {
@@ -5948,6 +6036,7 @@ Page({
       sort_store: 0,
       choice_sort_store: 1,
       sec_sto: item,
+      sec_i:index,
       sec_pick_index: 0
     });
   },
@@ -1345,6 +1345,12 @@
           </view>
         </view>
       </view>
+      <view class="searchbar flex-vertical-between storeListpadd">
+        <input class="inputstore fs28" placeholder="输入要搜索的门店" value="{{keyword}}" placeholder-class="fs28" maxlength="16" bindinput="input_store" bindconfirm="searchfn" />
+        <view class="search flex-center" bindtap="searchfn">
+          <view class="fs28">搜索</view>
+        </view>
+      </view>
       <!-- 门店列表，最外层的门店列表，一开始 -->
       <view class="store-list">
         <!-- 如果还没有点击更多门店的时候 -->
@@ -3116,3 +3116,26 @@ button.custom-service::after{
  	overflow-y: auto;
  }
  
+ .searchbar {
+  height: 95rpx;
+  border-bottom: 2rpx solid rgb(238, 238, 238);
+}
+.storeListpadd {
+  padding: 0rpx 31rpx;
+}
+.search {
+  width: 125rpx;
+  height: 45rpx;
+  line-height: 45rpx;
+  background-color: rgb(219, 27, 52);
+  border-radius: 30rpx;
+  color: rgb(255, 255, 255);
+}
+.inputstore {
+  width: 510rpx;
+  height: 43rpx;
+  line-height: 43rpx;
+  border-radius: 30rpx;
+  border: 2rpx solid rgb(238, 238, 238);
+  padding-left: 30rpx;
+}
@@ -257,6 +257,8 @@ Page({
     hiddenCS: true,
  
     is_retail_price: 0,
+    keyword:'', //门店搜索
+    sec_i:-1,//选中分类门店 下标
   },
  
   //------初始化加载----------
@@ -2009,7 +2011,93 @@ Page({
     }, 200)
  
   },
+  //获取搜索门店输入的值
+  input_store: function(e) {
+    this.setData({
+      keyword: e.detail.value
+    })
+  },
+  //搜索门店
+  searchfn(){
+    let choice_sort_store = this.data.choice_sort_store
+    if (choice_sort_store==0) {  //全局搜索
+      let all_pick_list = this.data.all_pick_list
+      let def_pickpu_list = this.data.def_pickpu_list
+      let keyword = this.data.keyword
+      if (keyword) {
+        let arr=all_pick_list.filter( item =>{
+          let i = item.pickup_name.indexOf(keyword)
+          if (i > -1) {
+            return true
+          }else{
+            return false
+          }
+        })
+        if (arr && arr.length>0) {        
+          if(this.data.is_show_sto_cat==1){
+            this.setData({
+              def_pickpu_list:arr
+            })       
+          }else{
+            this.setData({
+              only_pk:arr
+            })     
+          }
+        }else{
+          wx.showToast({
+            title: '没有搜索到门店',
+            icon: 'none',
+            duration: 2000
+          })
+        }
+      }else{
+        if (this.data.is_show_sto_cat==1) {
+          this.setData({
+            def_pickpu_list:all_pick_list.slice(0,10)
+          })       
+        }else{
+          this.setData({
+            only_pk:all_pick_list
+          })     
+        }
+
+      }
+    }else{   //分类下搜索
+      let sec_i=this.data.sec_i
+      let all_sto = this.data.all_sto
+      let sec_sto= this.data.sec_sto
+      let sec_arr = sec_sto.s_arr
+      let keyword = this.data.keyword
+      let text='sec_sto.s_arr'
+      if (keyword) {
+        let arr=sec_arr.filter( item =>{
+            let i = item.pickup_name.indexOf(keyword)
+            if (i > -1) {
+              return true
+            }else{
+              return false
+            }
+        })
+        if (arr && arr.length>0) {
+          this.setData({
+            [text]:arr
+          })                
+        }else{
+          wx.showToast({
+            title: '没有搜索到门店',
+            icon: 'none',
+            duration: 2000
+          })
+        }
+      }else{
+        this.setData({
+          [text]:all_sto[sec_i].s_arr
+        })       
+      }
+
  
+    }
+  },
  
   //------------处理门店---------------
   deal_pickup(e) {
@@ -3886,6 +3974,7 @@ Page({
       sort_store: 0,
       choice_sort_store: 1,
       sec_sto: item,
+      sec_i:index,
       sec_pick_index: 0
     });
   },
@@ -831,6 +831,12 @@
           </view>
         </view>
       </view>
+      <view class="searchbar flex-vertical-between storeListpadd">
+        <input class="inputstore fs28" placeholder="输入要搜索的门店" value="{{keyword}}" placeholder-class="fs28" maxlength="16" bindinput="input_store" bindconfirm="searchfn" />
+        <view class="search flex-center" bindtap="searchfn">
+          <view class="fs28">搜索</view>
+        </view>
+      </view>
       <!-- 门店列表，最外层的门店列表，一开始 -->
       <view class="store-list">
         <!-- 如果还没有点击更多门店的时候 -->
@@ -2993,4 +2993,27 @@ button.custom-service::after{
     top: -1000px;
 }
  
+.searchbar {
+  height: 95rpx;
+  border-bottom: 2rpx solid rgb(238, 238, 238);
+}
+.storeListpadd {
+  padding: 0rpx 31rpx;
+}
+.search {
+  width: 125rpx;
+  height: 45rpx;
+  line-height: 45rpx;
+  background-color: rgb(219, 27, 52);
+  border-radius: 30rpx;
+  color: rgb(255, 255, 255);
+}
+.inputstore {
+  width: 510rpx;
+  height: 43rpx;
+  line-height: 43rpx;
+  border-radius: 30rpx;
+  border: 2rpx solid rgb(238, 238, 238);
+  padding-left: 30rpx;
+}
  
@@ -67,6 +67,8 @@ Page({
       openSpecModal:0,
  
       is_get_guide:0,
+      keyword:'', //门店搜索
+      sec_i:-1,//选中分类门店 下标
  
   },
   onLoad: function (options) {
@@ -180,7 +182,93 @@ Page({
           })
       },1000)
   },
+  //获取搜索门店输入的值 
+  input_store: function(e) {
+    this.setData({
+      keyword: e.detail.value
+    })
+  },
+  //搜索门店
+  searchfn(){
+    let choice_sort_store = this.data.choice_sort_store
+    if (choice_sort_store==0) {  //全局搜索
+      let all_pick_list = this.data.all_pick_list
+      let def_pickpu_list = this.data.def_pickpu_list
+      let keyword = this.data.keyword
+      if (keyword) {
+        let arr=all_pick_list.filter( item =>{
+          let i = item.pickup_name.indexOf(keyword)
+          if (i > -1) {
+            return true
+          }else{
+            return false
+          }
+        })
+        if (arr && arr.length>0) {        
+          if(this.data.is_show_sto_cat==1){
+            this.setData({
+              def_pickpu_list:arr
+            })       
+          }else{
+            this.setData({
+              only_pk:arr
+            })     
+          }
+        }else{
+          wx.showToast({
+            title: '没有搜索到门店',
+            icon: 'none',
+            duration: 2000
+          })
+        }
+      }else{
+        if (this.data.is_show_sto_cat==1) {
+          this.setData({
+            def_pickpu_list:all_pick_list.slice(0,10)
+          })       
+        }else{
+          this.setData({
+            only_pk:all_pick_list
+          })     
+        }
  
+      }
+    }else{   //分类下搜索
+      let sec_i=this.data.sec_i
+      let all_sto = this.data.all_sto
+      let sec_sto= this.data.sec_sto
+      let sec_arr = sec_sto.s_arr
+      let keyword = this.data.keyword
+      let text='sec_sto.s_arr'
+      if (keyword) {
+        let arr=sec_arr.filter( item =>{
+            let i = item.pickup_name.indexOf(keyword)
+            if (i > -1) {
+              return true
+            }else{
+              return false
+            }
+        })
+        if (arr && arr.length>0) {
+          this.setData({
+            [text]:arr
+          })                
+        }else{
+          wx.showToast({
+            title: '没有搜索到门店',
+            icon: 'none',
+            duration: 2000
+          })
+        }
+      }else{
+        this.setData({
+          [text]:all_sto[sec_i].s_arr
+        })       
+      }
+
+
+    }
+  },
   //购买礼包
   GetBuyPrice: function (e) {
  
@@ -579,6 +667,7 @@ Page({
             region_name: region_name,
             sort_store: 0,
             choice_sort_store: 1,
+            sec_i:index,
             sec_sto: item,
             sec_pick_index: 0
         });
+<wxs module="filter" src="../../../../../utils/filter.wxs"></wxs>
 <view class="top_img" style="background-color: {{ad_data?ad_data.bgcolor:'rgb(250, 120, 88)'}};min-height: 100vh;">
 	<block wx:if="{{ad_data}}">
 		<view class="top_img">
@@ -230,4 +230,27 @@ page {
  
 .After_all .end {
   margin: 0rpx 15rpx;
+}
+.searchbar {
+  height: 95rpx;
+  border-bottom: 2rpx solid rgb(238, 238, 238);
+}
+.storeListpadd {
+  padding: 0rpx 31rpx;
+}
+.search {
+  width: 125rpx;
+  height: 45rpx;
+  line-height: 45rpx;
+  background-color: rgb(219, 27, 52);
+  border-radius: 30rpx;
+  color: rgb(255, 255, 255);
+}
+.inputstore {
+  width: 510rpx;
+  height: 43rpx;
+  line-height: 43rpx;
+  border-radius: 30rpx;
+  border: 2rpx solid rgb(238, 238, 238);
+  padding-left: 30rpx;
 }
 \ No newline at end of file
@@ -79,14 +79,27 @@ Page({
         screenWidth: 0,
         monthgiftbag:{},
         scene:"",
+        keyword:'', //门店搜索
+        sec_i:-1,//选中分类门店 下标
     },
     onLoad: function (options) {
  
         var th = this;
         console.log('分享参数---');
         console.log(options);
+        if (options.lbId && !options.id) {
+          options.id=options.lbId
+          // options.lbId=options.id
+        }
+        if (options.id) {
+          options.lbId=options.id
+          // options.lbId=options.id
+        }
+
+
         this.setData({
             params: options,
+            getGiftID:options.id
         })
  
         getApp().getConfig(function (e) {
@@ -253,6 +266,10 @@ Page({
     },
     getList: function (e) {
       var th = this;
+      if (!d.user_id) {
+        th.getList2()
+        return
+      }
       getApp().request.get('/api/weshop/marketing/marketingMonthgiftbagForm/page', {
         isShowLoading: true,
         data: {
@@ -404,6 +421,7 @@ Page({
                 getApp().goto('/packageE/pages/togoin/togoin');
                 return false;
             }
+            
             if (th.data.params && th.data.params.is_act) {
               this.getListInfo()
             }else{
@@ -879,7 +897,9 @@ Page({
         if (pagePath.indexOf('/') != 0) {
             pagePath = '/' + pagePath;
         }
-        pagePath += "?isBuy=1" + "&lbId=" + this.data.getGiftID + "&first_leader=" + this.data.getUserID;
+        pagePath += "?isBuy=1" + "&id=" +  this.data.options.id + "&first_leader=" + this.data.getUserID;
+        console.log('分享路径');
+        console.log(pagePath);
         // if (this.data.isBuy == 0) {
         //   pagePath += "&orderSn=" + this.data.orderSn;
         // } else {
@@ -940,7 +960,93 @@ Page({
  
  
     },
+  //获取搜索门店输入的值 
+  input_store: function(e) {
+    this.setData({
+      keyword: e.detail.value
+    })
+  },
+  //搜索门店
+  searchfn(){
+    let choice_sort_store = this.data.choice_sort_store
+    if (choice_sort_store==0) {  //全局搜索
+      let all_pick_list = this.data.all_pick_list
+      let def_pickpu_list = this.data.def_pickpu_list
+      let keyword = this.data.keyword
+      if (keyword) {
+        let arr=all_pick_list.filter( item =>{
+          let i = item.pickup_name.indexOf(keyword)
+          if (i > -1) {
+            return true
+          }else{
+            return false
+          }
+        })
+        if (arr && arr.length>0) {        
+          if(this.data.is_show_sto_cat==1){
+            this.setData({
+              def_pickpu_list:arr
+            })       
+          }else{
+            this.setData({
+              only_pk:arr
+            })     
+          }
+        }else{
+          wx.showToast({
+            title: '没有搜索到门店',
+            icon: 'none',
+            duration: 2000
+          })
+        }
+      }else{
+        if (this.data.is_show_sto_cat==1) {
+          this.setData({
+            def_pickpu_list:all_pick_list.slice(0,10)
+          })       
+        }else{
+          this.setData({
+            only_pk:all_pick_list
+          })     
+        }
+
+      }
+    }else{   //分类下搜索
+      let sec_i=this.data.sec_i
+      let all_sto = this.data.all_sto
+      let sec_sto= this.data.sec_sto
+      let sec_arr = sec_sto.s_arr
+      let keyword = this.data.keyword
+      let text='sec_sto.s_arr'
+      if (keyword) {
+        let arr=sec_arr.filter( item =>{
+            let i = item.pickup_name.indexOf(keyword)
+            if (i > -1) {
+              return true
+            }else{
+              return false
+            }
+        })
+        if (arr && arr.length>0) {
+          this.setData({
+            [text]:arr
+          })                
+        }else{
+          wx.showToast({
+            title: '没有搜索到门店',
+            icon: 'none',
+            duration: 2000
+          })
+        }
+      }else{
+        this.setData({
+          [text]:all_sto[sec_i].s_arr
+        })       
+      }
+
  
+    }
+  },
  
     getGift(){
       var that=this;
@@ -1149,6 +1255,7 @@ Page({
             region_name: region_name,
             sort_store: 0,
             choice_sort_store: 1,
+            sec_i:index,
             sec_sto: item,
             sec_pick_index: 0
         });
+<wxs module="filter" src="../../../../../utils/filter.wxs"></wxs>
 <view class="box data-v-3a5b7e36" style="background-color:{{default_color?default_color:'#e85f93'}};min-height: 100vh;">
   <view class="box_top data-v-3a5b7e36">
     <image  src="{{iurl}}{{monthgiftbag.cover_img}}" class="data-v-3a5b7e36" lazy-load="true" binderror="bind_bnerr" data-errorimg="giftImage"></image>
@@ -250,4 +250,27 @@ page.data-v-3a5b7e36 {
 .xc-share-frame {
    position: absolute; right:0; top: -10rpx;
 }
+.searchbar {
+  height: 95rpx;
+  border-bottom: 2rpx solid rgb(238, 238, 238);
+}
+.storeListpadd {
+  padding: 0rpx 31rpx;
+}
+.search {
+  width: 125rpx;
+  height: 45rpx;
+  line-height: 45rpx;
+  background-color: rgb(219, 27, 52);
+  border-radius: 30rpx;
+  color: rgb(255, 255, 255);
+}
+.inputstore {
+  width: 510rpx;
+  height: 43rpx;
+  line-height: 43rpx;
+  border-radius: 30rpx;
+  border: 2rpx solid rgb(238, 238, 238);
+  padding-left: 30rpx;
+}
  
@@ -15,6 +15,12 @@
           </view>
         </view>
       </view>
+      <view class="searchbar flex-vertical-between storeListpadd">
+        <input class="inputstore fs28" placeholder="输入要搜索的门店" value="{{keyword}}" placeholder-class="fs28" maxlength="16" bindinput="input_store" bindconfirm="searchfn" />
+        <view class="search flex-center" bindtap="searchfn">
+          <view class="fs28">搜索</view>
+        </view>
+      </view>
       <!-- 门店列表，最外层的门店列表，一开始 -->
       <view class="store-list">
         <!-- 如果还没有点击更多门店的时候 -->
@@ -37,7 +43,7 @@
                     </view>
                     <view>
                       <view class="distance fs24 address-val" wx:if="{{item.distance!=null}}">
-                        距离：{{item.distance>1000?filter.toFix(item.distance/1000,2)+'km':filter.toFix(item.distance,0)+"m"}}
+                        距离：{{item.distance >1000 ? filter.toFix(item.distance/1000,2)+'km':filter.toFix(item.distance,0)+"m"}}
                       </view>
                     </view>
                   </view>
@@ -67,6 +67,8 @@ Page({
       openSpecModal:0,
  
       is_get_guide:0,
+      keyword:'', //门店搜索
+      sec_i:-1,//选中分类门店 下标
  
   },
   onLoad: function (options) {
@@ -167,7 +169,93 @@ Page({
     },2000)
  
   },
+  //获取搜索门店输入的值
+  input_store: function(e) {
+    this.setData({
+      keyword: e.detail.value
+    })
+  },
+  //搜索门店
+  searchfn(){
+    let choice_sort_store = this.data.choice_sort_store
+    if (choice_sort_store==0) {  //全局搜索
+      let all_pick_list = this.data.all_pick_list
+      let def_pickpu_list = this.data.def_pickpu_list
+      let keyword = this.data.keyword
+      if (keyword) {
+        let arr=all_pick_list.filter( item =>{
+          let i = item.pickup_name.indexOf(keyword)
+          if (i > -1) {
+            return true
+          }else{
+            return false
+          }
+        })
+        if (arr && arr.length>0) {        
+          if(this.data.is_show_sto_cat==1){
+            this.setData({
+              def_pickpu_list:arr
+            })       
+          }else{
+            this.setData({
+              only_pk:arr
+            })     
+          }
+        }else{
+          wx.showToast({
+            title: '没有搜索到门店',
+            icon: 'none',
+            duration: 2000
+          })
+        }
+      }else{
+        if (this.data.is_show_sto_cat==1) {
+          this.setData({
+            def_pickpu_list:all_pick_list.slice(0,10)
+          })       
+        }else{
+          this.setData({
+            only_pk:all_pick_list
+          })     
+        }
  
+      }
+    }else{   //分类下搜索
+      let sec_i=this.data.sec_i
+      let all_sto = this.data.all_sto
+      let sec_sto= this.data.sec_sto
+      let sec_arr = sec_sto.s_arr
+      let keyword = this.data.keyword
+      let text='sec_sto.s_arr'
+      if (keyword) {
+        let arr=sec_arr.filter( item =>{
+            let i = item.pickup_name.indexOf(keyword)
+            if (i > -1) {
+              return true
+            }else{
+              return false
+            }
+        })
+        if (arr && arr.length>0) {
+          this.setData({
+            [text]:arr
+          })                
+        }else{
+          wx.showToast({
+            title: '没有搜索到门店',
+            icon: 'none',
+            duration: 2000
+          })
+        }
+      }else{
+        this.setData({
+          [text]:all_sto[sec_i].s_arr
+        })       
+      }
+
+
+    }
+  },
   //购买礼包
   GetBuyPrice: function (e) {
  
@@ -551,6 +639,7 @@ Page({
             sort_store: 0,
             choice_sort_store: 1,
             sec_sto: item,
+            sec_i:index,
             sec_pick_index: 0
         });
     },
@@ -230,4 +230,28 @@ page {
  
 .After_all .end {
   margin: 0rpx 15rpx;
+}
+
+.searchbar {
+  height: 95rpx;
+  border-bottom: 2rpx solid rgb(238, 238, 238);
+}
+.storeListpadd {
+  padding: 0rpx 31rpx;
+}
+.search {
+  width: 125rpx;
+  height: 45rpx;
+  line-height: 45rpx;
+  background-color: rgb(219, 27, 52);
+  border-radius: 30rpx;
+  color: rgb(255, 255, 255);
+}
+.inputstore {
+  width: 510rpx;
+  height: 43rpx;
+  line-height: 43rpx;
+  border-radius: 30rpx;
+  border: 2rpx solid rgb(238, 238, 238);
+  padding-left: 30rpx;
 }
 \ No newline at end of file
@@ -5,7 +5,7 @@ var e = getApp(),
     d = e.globalData;
 var ut = require("../../../utils/util.js");
 var com = require("../public/buy_com.js");
-
+ 
 Page({
     data: {
         url: a.url, //接口网址
@@ -76,8 +76,9 @@ Page({
  
         screenWidth: 0,
         submit:0,
-
-        is_detail:1 //是详情页面的购买
+        is_detail:1, //是详情页面的购买
+        keyword:'', //门店搜索
+        sec_i:-1,//选中分类门店 下标
     },
     onLoad: function (options) {
  
@@ -183,6 +184,93 @@ Page({
         })
         this.setData({ submit:0})
     },
+      //获取搜索门店输入的值
+    input_store: function(e) {
+      this.setData({
+        keyword: e.detail.value
+      })
+    },
+    //搜索门店
+    searchfn(){
+      let choice_sort_store = this.data.choice_sort_store
+      if (choice_sort_store==0) {  //全局搜索
+        let all_pick_list = this.data.all_pick_list
+        let def_pickpu_list = this.data.def_pickpu_list
+        let keyword = this.data.keyword
+        if (keyword) {
+          let arr=all_pick_list.filter( item =>{
+            let i = item.pickup_name.indexOf(keyword)
+            if (i > -1) {
+              return true
+            }else{
+              return false
+            }
+          })
+          if (arr && arr.length>0) {        
+            if(this.data.is_show_sto_cat==1){
+              this.setData({
+                def_pickpu_list:arr
+              })       
+            }else{
+              this.setData({
+                only_pk:arr
+              })     
+            }
+          }else{
+            wx.showToast({
+              title: '没有搜索到门店',
+              icon: 'none',
+              duration: 2000
+            })
+          }
+        }else{
+          if (this.data.is_show_sto_cat==1) {
+            this.setData({
+              def_pickpu_list:all_pick_list.slice(0,10)
+            })       
+          }else{
+            this.setData({
+              only_pk:all_pick_list
+            })     
+          }
+
+        }
+      }else{   //分类下搜索
+        let sec_i=this.data.sec_i
+        let all_sto = this.data.all_sto
+        let sec_sto= this.data.sec_sto
+        let sec_arr = sec_sto.s_arr
+        let keyword = this.data.keyword
+        let text='sec_sto.s_arr'
+        if (keyword) {
+          let arr=sec_arr.filter( item =>{
+              let i = item.pickup_name.indexOf(keyword)
+              if (i > -1) {
+                return true
+              }else{
+                return false
+              }
+          })
+          if (arr && arr.length>0) {
+            this.setData({
+              [text]:arr
+            })                
+          }else{
+            wx.showToast({
+              title: '没有搜索到门店',
+              icon: 'none',
+              duration: 2000
+            })
+          }
+        }else{
+          this.setData({
+            [text]:all_sto[sec_i].s_arr
+          })       
+        }
+
+
+      }
+    },
     GetBuyPrice: function (e) {
         var that = this.data;
         var th = this;
@@ -842,6 +930,7 @@ Page({
             region_name: region_name,
             sort_store: 0,
             choice_sort_store: 1,
+            sec_i:index,
             sec_sto: item,
             sec_pick_index: 0
         });
@@ -12,7 +12,7 @@
     <view class="top_title data-v-3a5b7e36">
       <text class="data-v-3a5b7e36 ellipsis-2" style="width:90%;">{{giftTitle}}</text>
  
-        <!-- 这个是分享按钮 -->
+        <!-- 这个是分享按钮 --> 
         <view wx:if="{{c_state<2 && isLogin}}" class="xc-share-frame t-c" bindtap="clickShare">
             <view class="iconfont icon-share fs40" ></view>
             <view class="fs22 c-7b">分享</view>
@@ -250,4 +250,26 @@ page.data-v-3a5b7e36 {
 .xc-share-frame {
    position: absolute; right:0; top: -10rpx;
 }
-
+.searchbar {
+  height: 95rpx;
+  border-bottom: 2rpx solid rgb(238, 238, 238);
+}
+.storeListpadd {
+  padding: 0rpx 31rpx;
+}
+.search {
+  width: 125rpx;
+  height: 45rpx;
+  line-height: 45rpx;
+  background-color: rgb(219, 27, 52);
+  border-radius: 30rpx;
+  color: rgb(255, 255, 255);
+}
+.inputstore {
+  width: 510rpx;
+  height: 43rpx;
+  line-height: 43rpx;
+  border-radius: 30rpx;
+  border: 2rpx solid rgb(238, 238, 238);
+  padding-left: 30rpx;
+}
@@ -15,7 +15,13 @@
           </view>
         </view>
       </view>
-      <!-- 门店列表，最外层的门店列表，一开始 -->
+      <view class="searchbar flex-vertical-between storeListpadd">
+        <input class="inputstore fs28" placeholder="输入要搜索的门店" value="{{keyword}}" placeholder-class="fs28" maxlength="16" bindinput="input_store" bindconfirm="searchfn" />
+        <view class="search flex-center" bindtap="searchfn">
+          <view class="fs28">搜索</view>
+        </view>
+      </view>
+      <!-- 门店列表，最外层的门店列表，一开始 -->  
       <view class="store-list">
         <!-- 如果还没有点击更多门店的时候 -->
         <block wx:if="{{choice_sort_store==0}}">
@@ -268,6 +268,8 @@ Page({
     base_nor_prom_id:0,
     base_nor_goods_id:0,
     user_pre_buynum:0, //用户优惠促销参与次数
+    keyword:'', //门店搜索
+    sec_i:-1,//选中分类门店 下标
   },
  
   //------初始化加载----------
@@ -3644,6 +3646,7 @@ Page({
  
   },
  
+  
  
   //---------拿出门店分类和门店------------
   get_sto(e) {
@@ -3693,6 +3696,8 @@ Page({
       clearInterval(timer_get);
  
  
+
+
       //如果会员是有默认的门店话
       if (!th.data.def_pick_store && th.data.fir_def_store && Object.keys(th.data.fir_def_store).length > 0) {
         th.setData({
@@ -3765,12 +3770,100 @@ Page({
               th.deal_pickup(e); //--普通门店排版--
             }, 800)
           }
+        }else{
+          wx.hideLoading();
         }
       })
     }, 200)
  
   },
+  //获取搜索门店输入的值 
+  input_store: function(e) {
+    this.setData({
+      keyword: e.detail.value
+    })
+  },
+  //搜索门店
+  searchfn(){
+    let choice_sort_store = this.data.choice_sort_store
+    if (choice_sort_store==0) {  //全局搜索
+      let all_pick_list = this.data.all_pick_list
+      let def_pickpu_list = this.data.def_pickpu_list
+      let keyword = this.data.keyword
+      if (keyword) {
+        let arr=all_pick_list.filter( item =>{
+          let i = item.pickup_name.indexOf(keyword)
+          if (i > -1) {
+            return true
+          }else{
+            return false
+          }
+        })
+        if (arr && arr.length>0) {        
+          if(this.data.is_show_sto_cat==1){
+            this.setData({
+              def_pickpu_list:arr
+            })       
+          }else{
+            this.setData({
+              only_pk:arr
+            })     
+          }
+        }else{
+          wx.showToast({
+            title: '没有搜索到门店',
+            icon: 'none',
+            duration: 2000
+          })
+        }
+      }else{
+        if (this.data.is_show_sto_cat==1) {
+          this.setData({
+            def_pickpu_list:all_pick_list.slice(0,10)
+          })       
+        }else{
+          this.setData({
+            only_pk:all_pick_list
+          })     
+        }
+
+      }
+    }else{   //分类下搜索
+      let sec_i=this.data.sec_i
+      let all_sto = this.data.all_sto
+      let sec_sto= this.data.sec_sto
+      let sec_arr = sec_sto.s_arr
+      let keyword = this.data.keyword
+      let text='sec_sto.s_arr'
+      if (keyword) {
+        let arr=sec_arr.filter( item =>{
+            let i = item.pickup_name.indexOf(keyword)
+            if (i > -1) {
+              return true
+            }else{
+              return false
+            }
+        })
+        if (arr && arr.length>0) {
+          this.setData({
+            [text]:arr
+          })                
+        }else{
+          wx.showToast({
+            title: '没有搜索到门店',
+            icon: 'none',
+            duration: 2000
+          })
+        }
+      }else{
+        this.setData({
+          [text]:all_sto[sec_i].s_arr
+        })       
+      }
+
  
+    }
+  },
  
   //------------处理门店---------------
   deal_pickup(e) {
@@ -7014,6 +7107,7 @@ Page({
       sort_store: 0,
       choice_sort_store: 1,
       sec_sto: item,
+      sec_i:index,
       sec_pick_index: 0
     });
   },
@@ -1606,6 +1606,12 @@
           </view>
         </view>
       </view>
+      <view class="searchbar flex-vertical-between storeListpadd">
+        <input class="inputstore fs28" placeholder="输入要搜索的门店" value="{{keyword}}" placeholder-class="fs28" maxlength="16" bindinput="input_store" bindconfirm="searchfn" />
+        <view class="search flex-center" bindtap="searchfn">
+          <view class="fs28">搜索</view>
+        </view>
+      </view>
       <!-- 门店列表，最外层的门店列表，一开始 -->
       <view class="store-list">
         <!-- 如果还没有点击更多门店的时候 -->
@@ -3383,7 +3383,7 @@ margin: auto; */
 	height: 120rpx;
 	line-height: 125rpx;
 	border-bottom: 1rpx solid #eee;
-
+  padding: 10rpx 0;
 }
  
 .store-list .store_choose .store {
@@ -4018,3 +4018,27 @@ button.custom-service::after {
 	left: -1000px;
 	top: -1000px;
 }
+
+.searchbar {
+  height: 95rpx;
+  border-bottom: 2rpx solid rgb(238, 238, 238);
+}
+.storeListpadd {
+  padding: 0rpx 31rpx;
+}
+.search {
+  width: 125rpx;
+  height: 45rpx;
+  line-height: 45rpx;
+  background-color: rgb(219, 27, 52);
+  border-radius: 30rpx;
+  color: rgb(255, 255, 255);
+}
+.inputstore {
+  width: 510rpx;
+  height: 43rpx;
+  line-height: 43rpx;
+  border-radius: 30rpx;
+  border: 2rpx solid rgb(238, 238, 238);
+  padding-left: 30rpx;
+}
 \ No newline at end of file