瀏覽代碼

搜索更新

zhuxiuping 2 年之前
父節點
當前提交
6fbd3a1708

+ 6 - 6
packageShang/pages/goods/goods-list.vue

@@ -229,11 +229,11 @@
 					//限时精选
 					let _self = this;
 					_self.goodsDatas=[]
-					var data='?limited=1&orderField='+_self.reqdata.sidx+'&order='+_self.reqdata.sord
+					var data='?limited=1&state=1&orderField='+_self.reqdata.sidx+'&order='+_self.reqdata.sord
 					goodslistlimit(data).then((res) => {
 						if (res.success) {
 							var total=res.data.totalCount
-							data='?limited=1&pageSize='+total+'&orderField='+_self.reqdata.sidx+'&order='+_self.reqdata.sord
+							data='?limited=1&state=1&pageSize='+total+'&orderField='+_self.reqdata.sidx+'&order='+_self.reqdata.sord
 							goodslistlimit(data).then((res) => {
 								if (res.success) {
 									res.data.list.forEach(data => {
@@ -248,12 +248,12 @@
 				}else if (this.pan==1){
 					let _self = this;
 					_self.goodsDatas=[]
-					var data='?hot=1'+'&orderField='+_self.reqdata.sidx+'&order='+_self.reqdata.sord
+					var data='?hot=1'+'&state=1&orderField='+_self.reqdata.sidx+'&order='+_self.reqdata.sord
 					// 热门推荐
 					goodslistlimit(data).then((res) => {
 						if (res.success) {
 							var total=res.data.totalCount
-							data='?hot=1&pageSize='+total+'&orderField='+_self.reqdata.sidx+'&order='+_self.reqdata.sord
+							data='?hot=1&state=1&pageSize='+total+'&orderField='+_self.reqdata.sidx+'&order='+_self.reqdata.sord
 							goodslistlimit(data).then((res) => {
 								if (res.success) {
 									res.data.list.forEach(data => {
@@ -269,9 +269,9 @@
 				
 				let _self = this;
 				//根据类别
-				var data='?categoryId='+_self.leiId+'&categoryLevel='+_self.leiLevel
+				var data='?categoryId='+_self.leiId+'&state=1&categoryLevel='+_self.leiLevel
 					+'&curPage='+_self.reqdata.page+'&pageSize='+_self.reqdata.rows
-					+'&goodsName='+_self.keyword+'&orderField='+_self.reqdata.sidx+'&order='+_self.reqdata.sord
+					+'&orderField='+_self.reqdata.sidx+'&order='+_self.reqdata.sord
 				goodslistlimit(data).then((res) => {
 					if (res.success) {
 						if (res.data) {

+ 7 - 6
packageShang/pages/goods/goods.vue

@@ -18,19 +18,19 @@
 				</view>
 				<view class="dflex fs-sm ft-dark">
 					<!-- #ifdef MP-WEIXIN || H5 -->
-					<view class="margin-right-sm dflex" @click="shareOpen">
+					<!-- <view class="margin-right-sm dflex" @click="shareOpen">
 						<view class="iconfont iconfenxiang padding-right-xs"></view>
 						<text>分享</text>
-					</view>
+					</view> -->
 					<!-- #endif -->
 					<!-- #ifdef MP-ALIPAY || MP-BAIDU || MP-QQ || MP-TOUTIAO -->
-					<button class="btn no-border padding-0 fs-sm ft-dark" open-type="share" @click="shareOpen">
+					<!-- <button class="btn no-border padding-0 fs-sm ft-dark" open-type="share" @click="shareOpen">
 						<view class="margin-right-sm dflex">
 							<view class="iconfont iconfenxiang padding-right-xs"></view>
 							<text>分享</text>
 							<text>{{ goods.shareCnt || '0' }}</text>
 						</view>
-					</button>
+					</button> -->
 					<!-- #endif -->
 					<view class="margin-right-sm dflex">
 						<view class="padding-right-xs padding-right-xs">已售</view>
@@ -1052,10 +1052,11 @@ contact-button {
 }
 
 // 加入购物车弹窗样式
-.body_pop {
+.body_pop {
+	margin-bottom: -20px;
 	position: relative;
 	padding: 0 20rpx;
-	height: 955rpx;
+	height: 100%;
 	border-radius: 22rpx 22rpx 0 0;
 	background-color: #fff;
 	overflow-y: auto;

+ 36 - 27
packageShang/pages/home/search/search.vue

@@ -27,7 +27,7 @@
 				<view
 					class="item margin-right-sm margin-bottom-sm dflex bg-drak border-radius-lg padding-tb-xs padding-lr"
 					v-for="(item,index) in historyDatas" :key="index" @click="search('history', item)">
-					<text>{{item.keyword}}</text>
+					<text>{{item}}</text>
 				</view>
 			</view>
 		</view>
@@ -84,13 +84,19 @@
 			loadData() {
 				let _self=this
 				//搜索历史列表
-				searchlist().then((res) => {
-					if(res.success){
-						_self.historyDatas = res.data.list
-					}else{
-						_self.$message.warning('没有符合条件的数据!')
-					}
-				})
+				let history = uni.getStorageSync('historyKeyword');
+				console.log(history,'history')
+				if (history) {
+				  _self.historyDatas = history.split(',');
+				}
+				console.log(_self.historyDatas,'_self.historyDatas')
+				// searchlist().then((res) => {
+				// 	if(res.success){
+				// 		_self.historyDatas = res.data.list
+				// 	}else{
+				// 		_self.$message.warning('没有符合条件的数据!')
+				// 	}
+				// })
 				//热门搜索列表
 				searchhot().then((res) => {
 					if(res.success){
@@ -100,6 +106,21 @@
 					}
 				})
 			},
+			//判断条数和去重
+			removeRepeat: function (value) {
+			  for (let i = 0; i < this.historyDatas.length; i++) {
+				if (value === this.historyDatas[i]) {
+				  this.historyDatas.splice(i, 1);
+				}
+			  }
+			  if (this.historyDatas.length < 10) {
+				this.historyDatas.unshift(value);
+			  } else {
+				this.historyDatas.pop();
+				this.historyDatas.unshift(value);
+			  }
+			},
+
 
 			shuru(event){
 				this.keyword=event.detail.value
@@ -109,18 +130,10 @@
 			search(type, item) {
 				switch (type) {
 					case 'history':
-						this.keyword=item.keyword
-						for( var i=0;i<this.historyDatas.length;i++){
-							if(item.keyword=this.historyDatas[i].keyword){
-								var id=this.historyDatas[i].id
-								var userId=this.historyDatas[i].userId
-								var searchCnt=parseInt(this.historyDatas[i].searchCnt)+1
-								var createBy=this.historyDatas[i].createBy
-								var createTime=this.historyDatas[i].createTime
-							}
-						}
+						this.removeRepeat(item);
+						uni.setStorageSync('historyKeyword', this.historyDatas.toString());
 						this.$api.togoodslist({
-							keyword: item.keyword,
+							keyword: item,
 							userId:userId,
 							searchCnt:searchCnt,
 							createBy:createBy,
@@ -147,6 +160,8 @@
 						});
 						break;
 					default:
+						this.removeRepeat(this.keyword);
+						uni.setStorageSync('historyKeyword', this.historyDatas.toString());
 						this.$api.togoodslist({
 							keyword: this.keyword,
 							searchCnt:1,
@@ -168,14 +183,8 @@
 					content: '清空搜索历史',
 					success: function(res) {
 						if (res.confirm) {
-							var data=ids
-							searchclear(data).then((res) => {
-								if(res.success){
-									_this.historyDatas = [];
-									return;
-								}
-								_this.$api.msg(res.msg)
-							})
+							uni.removeStorageSync('historyKeyword') //删除缓存
+							_this.historyDatas=[]
 						} else if (res.cancel) {
 							console.log('用户点击取消');
 						}

+ 12 - 0
packageShang/pages/order/create.vue

@@ -203,6 +203,8 @@
 			});
 		},
 		onShow() {
+			// 加载商品数据
+			this.loadData();
 			// if (this.addrData && this.addrData.id) return;
 			// this.$db[_address].where('create_uid == $env.uid').tofirst()
 			// 	.then(res => {
@@ -217,6 +219,9 @@
 			// 加载数据
 			loadData() {
 				var _self=this
+				_self.goodsDatas = []
+				_self.addrData={}
+				_self.submitToken=''
 				if(_self.type==1){
 					var goodsId=_self.goods_id
 				}else{
@@ -236,6 +241,13 @@
 						_self.submitToken=res.data.token.token
 						_self.calcTotalMoney();
 						_self.is_submit = 0;
+						console.log(!(_self.addrData && _self.addrData.id),'p')
+						if (!(_self.addrData && _self.addrData.id)) {
+							uni.navigateTo({
+								url:'/packageShang/pages/user/address/address'
+							})
+							return;
+						}
 						return
 					}
 					_self.$api.msg(res.msg);

+ 2 - 2
packageShang/pages/tabbar/home.vue

@@ -189,7 +189,7 @@
 			get_goodslist(){
 				let _self = this;
 				_self.goodsLimitDatas=[]
-				var data='?limited=1'
+				var data='?limited=1&state=1'
 				goodslistlimit(data).then((res) => {
 					if (res.success) {
 						var total=res.data.totalCount
@@ -210,7 +210,7 @@
 			get_good_hot(){
 				let _self = this;
 				_self.goodsHotDatas=[]
-				var data='?hot=1'
+				var data='?hot=1&state=1'
 				goodslistlimit(data).then((res) => {
 					if (res.success) {
 						var total=res.data.totalCount

+ 2 - 1
pages/home3/home3.vue

@@ -410,7 +410,8 @@ export default {
 				data: {
 					curPage: 1,
 					pageSize: 4,
-					hot: 1
+					hot: 1,
+					state:1
 				}
 			})
 			// console.log(res)

+ 4 - 3
pages/my/my.vue

@@ -54,7 +54,6 @@
 			<!-- 我的订单区域 -->
 			<view class="myOrder">
 				<view class="myOrder_header">
-					<img class="header_img" src="../../static/my/myorder5.png" />
 					<view class="header_title">商城订单</view>
 					<view class="header_more" @click="toOrder('/packageShang/pages/user/order/order', '全部')">
 						全部订单
@@ -410,8 +409,10 @@ export default {
 				}
 
 				.header_title {
-					margin-left: 11rpx;
-					font-size: 28rpx;
+					display: flex;
+					align-items: flex-end;
+					height: 64rpx;
+					font-size: 32rpx;
 					font-weight: bold;
 				}