圈子搜索

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/CircleManagementInfoServiceImpl.java

@@ -53,7 +53,7 @@ public class CircleManagementInfoServiceImpl implements ICircleManagementInfoSer
     public Page<CircleManagementInfo> list(Long commonId, String circleName, String circleLabel, Long status, Date gmtCreate, Date gmtUpdate, Long deleteFlag, Integer page, Integer limit) throws ServiceException {
         Wrapper<CircleManagementInfo> wrapper = new EntityWrapper<CircleManagementInfo>();
         if (!StringUtils.isEmpty(circleName)) {
-            wrapper.eq("circle_name", circleName);
+            wrapper.like("circle_name", circleName);
         }
         if (!StringUtils.isEmpty(circleLabel)) {
             wrapper.eq("circle_label", circleLabel);

xiaochengxu/config/index.js

@@ -1,6 +1,6 @@
 const dev = {
 	// baseUrlNew: 'http://192.168.110.72:8182',
-	baseUrlNew: 'http://192.168.110.138:8182',
+	baseUrlNew: 'http://192.168.110.82:8182',
 	// baseUrlNew: 'https://shiyaopinche.cspc.cn:10443',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false

xiaochengxu/pages/circle/changeCard.vue

@@ -31,18 +31,25 @@
 						</view>
 					</view>
 				</view>
-				<view class="">
-					<span> 拉黑</span>
-					<span>拒绝</span>
-					<span>接受</span>
+				<view class="" v-if="item.status==0">
+					<span @click='cardExchangeInfoEdit(1,item)'> 拉黑</span>
+					<span @click='cardExchangeInfoEdit(2,item)'>拒绝</span>
+					<span @click='cardExchangeInfoEdit(3,item)'>接受</span>
+					<span @click='cardExchangeInfoEdit(4,item)'>移除</span>
+				</view>
+				<view class="" v-else>
+					<span v-if="item.status==1">已接受</span>
+					<span v-if="item.status==3">已拒绝</span>
+					<span v-if="item.status==5">已过期</span>
+					<span v-if="item.status==7">已拉黑</span>
 				</view>
 				<view class="flex flex-between">
 					<span>来至 {{item.circleName}}</span>
 					<span> {{parseTime(item.gmtCreate)}}</span>
 				</view>
 			</view>
-			
 		</view>
+		<u-toast ref="uToast"></u-toast>
 	</view>
 </template>
 
@@ -79,6 +86,28 @@
 					this.cardList = res.data.items
 				})
 			},
+			cardExchangeInfoEdit(type,val){
+				uni.showLoading({
+					title: '数据加载中'
+				})
+				this.$request.baseRequest('admin.unimall.cardExchangeInfo', 'update', {
+					cardExchangeInfo:JSON.stringify(val),
+					updateFlag:type
+				}, failres => {
+					console.log('res+++++', failres.errmsg)
+					this.$refs.uToast.show({
+						type: 'error',
+						message: failres.errmsg,
+					})
+					uni.hideLoading()
+				}).then(res => {
+					uni.hideLoading()
+					this.$refs.uToast.show({
+						type: 'success',
+						message: "操作成功！",
+					})
+				})
+			}
 		}
 	}
 </script>

xiaochengxu/pages/circle/circle.vue

@@ -4,7 +4,7 @@
 			<view class="search flex flex-between" @click="search">
 				<view class="left flex">
 					<uni-icons type="search" size="24"></uni-icons>
-					<text class="search-val"> {{searchVal?searchVal:'搜索名片'}}</text>
+					<text class="search-val"> {{searchVal?searchVal:'搜索圈子'}}</text>
 				</view>
 				<view class="right">
 					<uni-icons type="mic" size="24" @click.stop="micOpen"></uni-icons>
@@ -68,8 +68,11 @@
 				canReset:false,
 			};
 		},
+		onLoad(options) {
+			this.searchVal = options.val
+		},
 		onShow() {
-			this.searchVal = uni.getStorageSync("cirlce_search_val") ? uni.getStorageSync("cirlce_search_val") : ''
+			// this.searchVal = uni.getStorageSync("cirlce_search_val") ? uni.getStorageSync("cirlce_search_val") : ''
 			this.userInfo = uni.getStorageSync("userInfo")
 			this.$nextTick(function() {
 				this.canReset && this.mescroll.resetUpScroll() // 重置列表数据为第一页  
@@ -105,11 +108,15 @@
 				uni.showLoading({
 					title: '数据加载中'
 				})
-				this.$request.baseRequest('admin.unimall.circleManagementInfo', 'list', {
+				let _data = {
 					commonId: this.userInfo.id,
-					pageNum: page.num,
-					pageSize: page.size,
-				}, failres => {
+					page: page.num,
+					limit: page.size,
+				}
+				if(this.searchVal){
+					_data.circleName = this.searchVal
+				}
+				this.$request.baseRequest('admin.unimall.circleManagementInfo', 'list', _data, failres => {
 					console.log('res+++++', failres.errmsg)
 					this.$refs.uToast.show({
 						type: 'error',

xiaochengxu/pages/circle/detail.vue

@@ -115,7 +115,6 @@
 		},
 		methods: {
 			confirmChangeSubmit() {
-				debugger
 				this.$request.baseRequest('admin.unimall.cardExchangeInfo', 'add', {
 					cardExchangeInfo: JSON.stringify({
 						sendId: this.userInfo.id,
@@ -252,8 +251,8 @@
 					commonId: this.userInfo.id,
 					id: this.dataObj.id,
 					status: this.cardStatus,
-					pageNum: page.num,
-					pageSize: page.size,
+					page: page.num,
+					limit: page.size,
 				}, failres => {
 					console.log('res+++++', failres.errmsg)
 					this.$refs.uToast.show({

xiaochengxu/pages/circle/search.vue

@@ -20,14 +20,18 @@
 			};
 		},
 		methods: {
-			onClickDelAll() {
+			onClickDelAll(val) {
+				console.log(val)
 			},
 			onSearchName(e) {
-				uni.setStorageSync('cirlce_search_val', e);
-				uni.switchTab({
-					url:"/pages/circle/circle"
-					
+				// uni.setStorageSync('cirlce_search_val', e);
+				uni.redirectTo({
+					url:`/pages/circle/circle?val=${e}`
 				})
+				// uni.switchTab({
+				// 	url:"/pages/circle/circle?val="+e
+					
+				// })
 			}
 		}
 	}

xiaochengxu/uni_modules/d-search-log/components/d-search-log/d-search-log.vue

@@ -3,10 +3,12 @@
 		
 		<view class="dSLComVueTop">
 			<view class="dSLComVueTopLeft">
-				<image src="/static/icon_img/search.png" class="dSLComVueTopLeftImg" style="width: 30rpx;height: 30rpx;flex: none;"></image>
+				<u-icon name="search" size="30"></u-icon>
+				<!-- <image src="/static/icon_img/search.png" class="dSLComVueTopLeftImg" style="width: 30rpx;height: 30rpx;flex: none;"></image> -->
 				<input  class="dSLComVueTopLeftInput" v-model="search_input" type="text" :placeholder="placeholder" @blur="onClickInput" />
 				<view class="dSLComVueTopLeftDel" v-if="search_input" @click="onClickDel">
-					<image src="/static/icon_img/del.png" class="dSLComVueTopLeftDelImg" style="width: 35rpx;height: 35rpx;flex: none;" ></image>
+					<u-icon name="close" size="20"></u-icon>
+					<!-- <image src="/static/icon_img/del.png" class="dSLComVueTopLeftDelImg" style="width: 35rpx;height: 35rpx;flex: none;" ></image> -->
 				</view>
 			</view>
 			<view class="dSLComVueTopRight">
@@ -18,7 +20,8 @@
 			<view class="dSLComVueTitle" >
 				<text>搜索历史</text>
 				<view style="width: 100rpx;height: 60rpx;display: flex;align-items: center;" @click="onClickDelAll">
-					<image src="./static/icon_img/del2.png" style="width: 40rpx;height: 40rpx;margin-right: 35rpx;"></image>
+					<u-icon name="trash-fill" size="30"></u-icon>
+					<!-- <image src="./static/icon_img/del2.png" style="width: 40rpx;height: 40rpx;margin-right: 35rpx;"></image> -->
 				</view>
 			</view>