Merge branch 'dev_oa_fu18' into dev

WXD-SEASON\season
2 parents 8b708855 b31d30ef
Showing 9 changed files with 209 additions and 22 deletions
packageA/pages/jfbuy/jfbuy.js
packageA/pages/jfbuy/jfbuy.wxml
packageA/pages/jfbuy/jfbuy.wxss
packageE/pages/user/cardinfo/cardinfo.js
packageE/pages/user/cardinfo/cardinfo.wxml
packageE/pages/user/cardinfo/cardinfo.wxss
pages/user/plus/plus.js
pages/user/plus/plus.wxml
pages/user/plus/plus.wxss
@@ -35,6 +35,7 @@ Page({
 		key_str:'',
 		pattern:0,      //分成的方式
 		pageSize:10,
+	    curr:10,
 		currentPage:1,  //当前的页码
  
 		// canvasHidden: 1, //-- 隐藏画布 --
@@ -57,8 +58,12 @@ Page({
  
 		triggered: false,
 		isPullDownRefresh: false,
-		
-		
+
+	    //-- 和搜索框相关的 --
+	    search_ing:0,
+	    hiddenClear:1,
+	    focus:false,
+	    keyword:''
   },
  
   /**
@@ -353,9 +358,44 @@ Page({
  
 		this.request_list(data);
 	},
-	
  
-	
+	sear_list(){
+		var th=this;
+		var psize=th.data.curr;
+
+		this.setData({
+			is_no_data2:0,
+			is_no_more2:0,
+			list2:[],
+			is_load2: 0,
+			currentPage2:1,
+			pageSize:psize
+		});
+
+		var data = {
+			store_id:oo.stoid,
+			stype: this.data.requestData.stype,
+			stypeup:1,
+			page:1,
+			pageSize:psize
+		};
+
+		if(this.data.isUp) {
+			data.stypeup = 0;
+		} else {
+			data.stypeup = 1;
+		};
+
+		data.keyword=this.data.keyword
+
+		// this.data.requestData = data;
+		this.setData({
+			requestData: data
+		})
+
+		this.request_list(data);
+	},
+
  
 	request_list: function(data, callback){	
 		// console.log('触发上拉刷新');
@@ -421,9 +461,6 @@ Page({
 		this.request_list(data);
  
 	},
-
-  
-	
  
 	//---图片失败，默认图片---
 	bind_bnerr2: function (e) {
@@ -491,6 +528,51 @@ Page({
 		var viewHeight = this.data.clientWidth / ratio;
 		var con_heihgt=this.data.clientHeight-viewHeight;
 		this.setData({con_heihgt:con_heihgt,isshow:1})
-	
+	},
+
+
+	/*-- 和搜索相关 --*/
+	show_search(){
+		this.setData({
+			search_ing:1,
+			hiddenClear:1,
+			keyword:'',
+			focus:true
+		})
+	},
+
+	getInput(e) {
+		let val = e.detail.value;
+		if (val) {
+			this.setData({
+				keyword: e.detail.value,
+				hiddenClear: false,
+			});
+		} else {
+			this.setData({
+				hiddenClear: true,
+			});
+		}
+	},
+
+	clearInput() {
+		this.setData({
+			keyword: '',
+			hiddenClear: true,
+		});
+	},
+
+	close_layer:function (){
+		this.setData({
+			search_ing:0,
+			hiddenClear:1,
+		})
+	},
+
+	//开始搜索
+	submitSearch(){
+		this.sear_list();
+		this.close_layer();
 	}
+
 })
 \ No newline at end of file
@@ -23,6 +23,11 @@
 			<block wx:for="{{tab}}">
 				<view class="title-item {{currentIndex == (index+1) ? 'active' + (isUp?' active1':''):''}}" data-index="{{index+1}}" bindtap="clickTab">{{item}}</view>
 			</block>
+
+			<view catchtap="show_search" class="flex ai-center"  style="height:80rpx; width:80rpx">
+				<text class="iconfont icon-search_fd" style="font-size:30rpx; " ></text>
+			</view>
+
 		</view>
  
 		<!-- <view> -->
@@ -69,3 +74,19 @@
  
 	</view>
 </view>
+
+<!-- 和搜索相关 -->
+<view wx:if="{{search_ing}}">
+	<view class="cover-layer"></view>
+	<view class="s_box">
+		<view class="s_p_box">
+			<view class="input-box">
+				<text class="before iconfont icon-search_fd" catchtap="submitSearch"></text>
+				<input class="input-search" name="word" placeholder="请输入商品关键字" focus="focus"
+					   bindconfirm="submitSearch" bindinput="getInput" bindfocus="inputFocus" value="{{keyword}}" />
+				<text class="iconfont icon-guan" hidden="{{hiddenClear}}" catchtap="clearInput"></text>
+			</view>
+			<button catchtap="close_layer" style="margin-left:26rpx">取消</button>
+		</view>
+	</view>
+</view>
 \ No newline at end of file
@@ -63,6 +63,7 @@ page {
 	width: 100%;
 	top: 0;
 	z-index: 3;
+	align-items: center;
 }
 .title .iconfont {
 	color: #ccc;
@@ -429,4 +430,37 @@ radio .wx-radio-input.wx-radio-input-checked::before{
 	margin-left:25rpx;
 	margin-right:25rpx;
 	margin-top: 30rpx;
-}
 \ No newline at end of file
+}
+
+
+/*-- 搜索相关 --*/
+.s_box{ position: fixed;top:0;left: 0;background-color: #fff; width: 100%; z-index: 111111}
+.s_p_box{
+	padding:30rpx 40rpx;display: flex; align-items: center;
+}
+.input-box {
+	position: relative;
+	flex: 1;
+	padding-left: 30rpx;
+	padding-right: 70rpx;
+    background-color: #f0f0f0;
+    display: flex;
+    align-items: center;
+}
+
+.input-search {
+	position: relative;
+	padding: 10rpx;
+    ont-size: 28rpx;
+    width: 100%;
+}
+
+.icon-guan {
+	font-size: 20rpx;
+	padding: 10rpx;
+	position: absolute;
+	right: 20rpx;
+	top: 50%;
+	transform: translateY(-50%);
+}
+
@@ -65,11 +65,14 @@ Page({
     //-----------等级卡说明-------------------
     getApp().request.promiseGet("/api/weshop/storeconfig/get/" + os.stoid, {
     }).then(res => {
-      var is_cardrule = res.data.data.cardrules;
-      w.wxParse("content", "html", ut.format_content(is_cardrule), ee, 6);
-      ee.setData({
-        is_card_rule: is_cardrule
-      });
+         var is_cardrule = res.data.data.cardrules;
+         var switch_list = res.data.data.switch_list;
+         var swi_arr = JSON.parse(switch_list);
+          w.wxParse("content", "html", ut.format_content(is_cardrule), ee, 6);
+          ee.setData({
+              is_card_rule: is_cardrule,
+              plus_bg_color: swi_arr.plus_bg_color,
+          });
     })
  
     //----------------------------获取最大的卡类-----------------------
@@ -4,9 +4,13 @@
    <view> 
   <image class="Member_bk" src="{{url}}/miniapp/images/plus/page_bk.png"></image>
 </view>
- <view class="Opening_bk">
-      <image src="{{url}}/miniapp/images/plus/card_bk.png"></image>
-    </view>
+<view class="Opening_bk">
+<!--      <image src="{{url}}/miniapp/images/plus/card_bk.png"></image>-->
+     <view class="rect">
+         <!-- 根据后台来定义一下背景颜色 -->
+         <view class="before" style="{{plus_bg_color?'background-color:'+plus_bg_color:''}}"></view>
+     </view>
+ </view>
  
         <view class="MemberPlus rel"style="background-image:url('{{user_card.CardImg}}');background-size: 100% 100%;background-repead:no-repead;">
  
@@ -220,7 +220,7 @@ align-items:center;
 .fs36{
   font-size: 36rpx; 
 }
-.Opening_bk image {
+.Opening_bk{
   position: absolute;
  
   width: 100%;
@@ -238,4 +238,24 @@ align-items:center;
   border-top-left-radius: 55rpx;  border-bottom-left-radius:55rpx;  }
  .content  .card_list .list .card_name{ max-width: 230rpx}
  
- .price_show .thr{color: #999; text-decoration:line-through }
 \ No newline at end of file
+ .price_show .thr{color: #999; text-decoration:line-through }
+
+
+ /* 定义矩形 */
+ .rect {
+   width: 100%;
+   height: 300rpx;
+   position: relative; /* 要设置位置是因为要设置扇形遮罩的位置 */
+   overflow: hidden;
+ }
+
+ /* 定义扇形遮罩 */
+ .rect .before {
+   width: 140%;
+   height: 300rpx;
+   background-color: #f0ba94;
+   position: absolute; /* 要用绝对定位 */
+   left: -20%;
+   top: -2rpx;
+   border-radius: 0 0 50% 50%; /* 只要顶部两个角是圆弧就好了 */
+ }
 \ No newline at end of file
@@ -111,7 +111,8 @@ Page({
         that.setData({
           is_card_rule: is_cardrule,
           isyaoqingma: parseInt(swi_arr.isyaoqingma),
-          is_salesman: parseInt(swi_arr.is_staffno)
+          is_salesman: parseInt(swi_arr.is_staffno),
+          plus_bg_color: swi_arr.plus_bg_color,
         });
       }
     });
@@ -10,7 +10,10 @@
     <block wx:if="{{is_plusCard}}">
       <view class="Opening_plus">
         <view class="Opening_bk">
-          <image src="{{url}}/miniapp/images/plus/card_bk.png"></image>
+<!--          <image src="{{url}}/miniapp/images/plus/card_bk.png"></image>-->
+           <view class="rect">
+              <view class="before" style="{{plus_bg_color?'background-color:'+plus_bg_color:''}}"></view>
+           </view>
         </view>
         <view class="swiper">
           <!-- 未开通会员swiper-item -->
@@ -58,7 +58,7 @@ page {
   width: 50%;
   text-align: center;
 }
-.Opening_bk image {
+.Opening_bk{
   position: absolute;
   z-index: 2;
   width: 100%;
@@ -404,4 +404,23 @@ margin-top: 10rpx;
  
 swiper-item{
   overflow: visible;
+}
+
+/* 定义矩形 */
+.rect {
+  width: 100%;
+  height: 300rpx;
+  position: relative; /* 要设置位置是因为要设置扇形遮罩的位置 */
+  overflow: hidden;
+}
+
+/* 定义扇形遮罩 */
+.rect .before {
+  width: 140%;
+  height: 300rpx;
+  background-color: #f0ba94;
+  position: absolute; /* 要用绝对定位 */
+  left: -20%;
+  top: -2rpx;
+  border-radius: 0 0 50% 50%; /* 只要顶部两个角是圆弧就好了 */
 }
 \ No newline at end of file