From e1491b8d189bf9207a91d25f53acb5e0aeba038b Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期三, 17 五月 2023 22:33:36 +0800
Subject: [PATCH] no message

---
 uniapp/manifest.json                   |    4 
 uniapp/pages.json                      |   34 ++
 uniapp/pages/mine/inviteFriends.vue    |    1 
 uniapp/pages/active/dysearch.vue       |   16 
 uniapp/pages/rankinglist/fengqiang.vue |   65 +++++
 uniapp/components/colGoods.vue         |    2 
 uniapp/components/indexPage.vue        |   71 +++--
 uniapp/utils/http.api.js               |    4 
 uniapp/pages/mine/mine.vue             |    8 
 uniapp/pages/active/tmsearch.vue       |  499 +++++++++++++++++++++++++++++++++++++++++
 10 files changed, 653 insertions(+), 51 deletions(-)

diff --git a/uniapp/components/colGoods.vue b/uniapp/components/colGoods.vue
index 041ac6b..a1c9b4c 100644
--- a/uniapp/components/colGoods.vue
+++ b/uniapp/components/colGoods.vue
@@ -9,7 +9,7 @@
 					<view class="typeIcon-content defIcon">
 						<image :src="items.labelImg" mode="heightFix"></image>
 					</view>
-					<view class="goodsText">
+					<view style="white-space: inherit;" class="goodsText">
 						{{items.dtitle}}
 					</view>
 				</view>
diff --git a/uniapp/components/indexPage.vue b/uniapp/components/indexPage.vue
index b34d14c..89b19b2 100644
--- a/uniapp/components/indexPage.vue
+++ b/uniapp/components/indexPage.vue
@@ -27,26 +27,8 @@
 								</swiper-item>
 							</swiper>
 						</view>
-
-						<view class="centerSwiper-container colCenCen borderBox" v-if="singleLineList.length>0">
-							<swiper class="swiper-box" :autoplay="true" :interval="5000" :duration="300" circular>
-								<swiper-item v-for="(items,index) in singleLineList" :key='index'>
-									<view class="swiper-item defIcon" @click="goUrl(items)">
-										<image :src="items.image" mode="aspectFit"></image>
-									</view>
-								</swiper-item>
-							</swiper>
-						</view>
-
-						<view class="cardsList-container rowCenBet borderBox" v-if="doubleLineList.length>0">
-							<block v-for="(items,index) in doubleLineList" :key='index'>
-								<view class="card-items defIcon" @click="goUrl(items)">
-									<image :src="items.image" mode="aspectFill" lazy-load="true"></image>
-								</view>
-							</block>
-						</view>
-
-
+						
+						
 						<!-- 閲戝垰鍖� -->
 						<view class="navslider-box" v-if="navbarShowList.length > 0">
 							<swiper class="swiper-type swiper-nav"
@@ -63,11 +45,32 @@
 								</swiper-item>
 							</swiper>
 						</view>
+						
+						<!--鍗曞垪鍥剧墖-->
+						<view class="centerSwiper-container colCenCen borderBox" v-if="singleLineList.length>0">
+							<swiper class="swiper-box" :autoplay="true" :interval="5000" :duration="300" circular>
+								<swiper-item v-for="(items,index) in singleLineList" :key='index'>
+									<view class="swiper-item defIcon" @click="goUrl(items)">
+										<image :src="items.image" mode="aspectFit"></image>
+									</view>
+								</swiper-item>
+							</swiper>
+						</view>
+						
+						<!--鍙屽垪鍥剧墖-->
+						<view class="cardsList-container rowCenBet borderBox" v-if="doubleLineList.length>0">
+							<block v-for="(items,index) in doubleLineList" :key='index'>
+								<view class="card-items defIcon" @click="goUrl(items)">
+									<image :src="items.image" mode="aspectFill" lazy-load="true"></image>
+								</view>
+							</block>
+						</view>
+						
 					</view>
 				</view>
-
+	
 				<view class="pagebottomBody-container colCen borderBox">
-
+					
 					<view class="bottomSwiper-container colCenCen borderBox" v-if="bottomBannerList.length>0">
 						<swiper class="swiper-box" :autoplay="true" :interval="3000" :duration="300" circular>
 							<swiper-item v-for="(items,index) in bottomBannerList" :key='index'>
@@ -77,7 +80,7 @@
 							</swiper-item>
 						</swiper>
 					</view>
-
+					<!--鍏ㄧ綉鐑攢-->
 					<view class="van-row">
 						<view class="van-col van-col--12" style="padding-right: 10rpx;">
 							<view class="home-row" @click="gorxb()">
@@ -128,7 +131,7 @@
 						</view>
 					</view>
 					<!-- 澶у閮藉湪涔� -->
-					<view class="everysBuying-container colCen" v-if="zdmList.length>0">
+					<!-- <view class="everysBuying-container colCen" v-if="zdmList.length>0">
 						<view class="box-bar-content rowCen">
 							<view class="title-text">
 								姣忔棩蹇呬拱
@@ -183,11 +186,9 @@
 							</scroll-view>
 						</view>
 
-						<!-- <view class="progress">
-						鍚庨潰澶勭悊
+					
 					</view> -->
-					</view>
-					<view class="goodsFalling-container colCen" v-if="fallingList.length>0">
+					<!-- <view class="goodsFalling-container colCen" v-if="fallingList.length>0">
 						<view class="box-bar-content rowCen">
 							<view class="title-text">
 								濂借揣鐩撮檷
@@ -253,10 +254,10 @@
 								</view>
 							</scroll-view>
 						</view>
-					</view>
+					</view> -->
 
 					<!-- 绂忓埄鎶㈣喘 -->
-					<view class="welfare-container colCen">
+					<!-- <view class="welfare-container colCen">
 						<view class="titlebar-container rowCenBet">
 							<view class="left-content rowCen">
 								<view class="titletext">
@@ -330,7 +331,7 @@
 								</view>
 							</block>
 						</view>
-					</view>
+					</view> -->
 
 					<!-- 瀹炴椂鐤姠姒� -->
 
@@ -434,6 +435,11 @@
 						type: 2
 					},
 					{
+						mainTitle: '鎶栭煶',
+						subTitle: '濂界墿鎶㈣喘',
+						type: 6
+					},
+					{
 						mainTitle: '鎷煎澶�',
 						subTitle: '鐧句嚎琛ヨ创',
 						type: 3
@@ -515,7 +521,7 @@
 					type: 1
 				};
 				var open_like_recommend = uni.getStorageSync('open_like_recommend');
-				if(this.typedataList.length == 4)this.typedataList.shift()
+				if(this.typedataList.length == 5)this.typedataList.shift()
 				if(open_like_recommend == 1){
 					this.typedataList.unshift(tmp_2);
 					this.bottomType = tmp_2.type;
@@ -657,6 +663,7 @@
 					pageSize: 10,
 					type: type
 				}).then(e => {
+				    console.log(e)
 					if (e.code != 0) return that.$alert(e.msg)
 					var res = e.data.list;
 					if (res.length < 10) {
diff --git a/uniapp/manifest.json b/uniapp/manifest.json
index fcad828..7c67119 100644
--- a/uniapp/manifest.json
+++ b/uniapp/manifest.json
@@ -2,8 +2,8 @@
     "name" : "澶ц繑瀹�",
     "appid" : "__UNI__FC8858A",
     "description" : "澶ц繑瀹榓pp",
-    "versionName" : "1.0.5",
-    "versionCode" : 105,
+    "versionName" : "1.0.7",
+    "versionCode" : 107,
     "transformPx" : false,
     /* 5+App鐗规湁鐩稿叧 */
     "app-plus" : {
diff --git a/uniapp/pages.json b/uniapp/pages.json
index 6769617..bf53169 100644
--- a/uniapp/pages.json
+++ b/uniapp/pages.json
@@ -196,6 +196,22 @@
 			"enablePullDownRefresh": true,
 			"onReachBottomDistance": 300
 		},
+		// tm閲戝垰鍖�
+		{
+			"path": "pages/active/tmsearch",
+			"navigationStyle": "custom",
+			"app-plus": {
+				"titleNView": false,
+				"pullToRefresh": {
+					"support": true
+				}
+			},
+			"style": {
+				"enablePullDownRefresh": true
+			},
+			"enablePullDownRefresh": true,
+			"onReachBottomDistance": 300
+		},
 		// 鍝佺墝璇︽儏
 		{
 			"path": "pages/active/brandList",
@@ -431,9 +447,9 @@
 				"navigationBarTextStyle": "black"
 			}
 		},
-		// 瓒呯骇鍒嗙被
+		// 鐤姠姒�
 		{
-			"path": "pages/classify/classify",
+			"path": "pages/rankinglist/fengqiang",
 			"style": {
 				"navigationStyle": "custom",
 				"app-plus": {
@@ -441,6 +457,16 @@
 				}
 			}
 		},
+		// 瓒呯骇鍒嗙被
+		/* {
+			"path": "pages/classify/classify",
+			"style": {
+				"navigationStyle": "custom",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		}, */
 		// 鎴戠殑璁㈠崟
 		{
 			"path": "pages/mine/myOrder",
@@ -831,10 +857,10 @@
 				"text": " 棣栭〉"
 			},
 			{
-				"pagePath": "pages/classify/classify",
+				"pagePath": "pages/rankinglist/fengqiang",
 				"iconPath": "static/images/tabBar/classify.png",
 				"selectedIconPath": "static/images/tabBar/classifyActive.png",
-				"text": "瓒呯骇鍒嗙被"
+				"text": "鐤姠姒�"
 			},
 			{
 				"pagePath": "pages/find/find",
diff --git a/uniapp/pages/active/dysearch.vue b/uniapp/pages/active/dysearch.vue
index a16864e..d07202a 100644
--- a/uniapp/pages/active/dysearch.vue
+++ b/uniapp/pages/active/dysearch.vue
@@ -50,10 +50,10 @@
 			<view class="rangeList-container rowCen" :class="scrollTop>fiexdtop?'tofixed':''" :style="'top:'+(scrollTop>fiexdtop?fiexdHeight:'0')+'px;'">
 				<scroll-view class="scrollview-content" scroll-x scroll-with-animation="true">
 					<block v-for="(items,index) in navList" :key="index">
-						<view class="rangeItem" :class="nowCurrent==items.cid?'rangeItem-active':''" @tap="changeRange(items.cid)">
+						<view class="rangeItem" :class="nowCurrent==items.cat_id?'rangeItem-active':''" @tap="changeRange(items.cat_id)">
 							<view class="boxcontent colCenCen">
 								<view class="nameBox">
-									{{items.cname}}
+									{{items.cat_name}}
 								</view>
 								<view class="border"></view>
 							</view>
@@ -119,22 +119,24 @@
 		methods: {
 			getNav() {
 				var that = this;
-				that.getData();
-				/* this.$u.api.getTopCalss({ctype:3}).then(e => {
+			    this.$u.api.getHdkCategoryList({type:4}).then(e => {
+				    console.log(e);
 					if(e.code != 0)return that.$alert(e.msg)
 					that.navList = e.data.list;
-					that.nowCurrent = that.navList[0].cid
+					that.nowCurrent = that.navList[0].cat_id
 					that.getData()
 				}).catch(function (err) {
-				}) */
+				}) 
 			},
 			getData() {
 				var that = this;
+				console.log(this.nowCurrent);
 				this.$u.api.goodsSearch({
 					type: 'dy',
 					pageId: this.pageCurrent,
 					pageSize: 10,
 					sort: 0,
+					catid:this.nowCurrent,
 					//owner: this.selfsupport ? 'g' : '',
 					//selectCoupon: this.selectCoupon == true ? 1 : 0
 				}).then(e => {
@@ -142,7 +144,7 @@
 					var res = e.data;
 					uni.stopPullDownRefresh();
 					var res = e.data.list;
-					console.log(res);
+					
 					if (res.length < 10) {
 						that.pageCurrent ++
 						that.canloadmore = false
diff --git a/uniapp/pages/active/tmsearch.vue b/uniapp/pages/active/tmsearch.vue
new file mode 100644
index 0000000..2de88e6
--- /dev/null
+++ b/uniapp/pages/active/tmsearch.vue
@@ -0,0 +1,499 @@
+<template>
+	<view class="pddsearch-wrapper wrapperLayer borderBox">
+		<view class="topbarbox"></view>
+		<view class="fixed-container colCen">
+			<view class="topbarbox"></view>
+			<view class="headerBar-container rowCenBet">
+				<view class="iconfont backicon" @tap="goback()">
+					&#xe630;
+				</view>
+				<view class="titleBox rowCen" :style="'color:'+ (scrollTop<fiexdtop?'#DD2425;':'#ffffff;')">
+					澶╃尗
+				</view>
+				<view class="rightEmpty">
+				</view>
+			</view>
+		</view>
+		<view class="pageContent-container colCen">
+			<view class="search-region colCen">
+				<view class="pageTitle-bar rowCenCen">
+					<view class="leftIcon defIcon">
+						<image src="https://yanfeiobpub.obs.cn-east-3.myhuaweicloud.com/dfg/tmlogo.png" mode="aspectFill"></image>
+					</view>
+					<view class="titleInfo colSta">
+						<view class="topfont">
+							澶╃尗浼樻儬鍒稿ぇ鏀鹃��
+						</view>
+						<view class="bottomfont">
+							鍏堥鍒� 鍐嶈喘鐗� 鐪佸崈鍏�
+						</view>
+					</view>
+				</view>
+
+				<view class="searchContent rowCenBet" @tap="gosearch()">
+					<view class="leftcontent rowCen">
+						<view class="search-icon iconfont">
+							&#xe616;
+						</view>
+						<view class="tipsfont">
+							杈撳叆鍟嗗搧鍚嶇О鎴栫矘璐村疂璐濇爣棰樻悳绱�
+						</view>
+					</view>
+					<view class="right-btn rowCenCen">
+						<view>鎼滅储</view>
+					</view>
+				</view>
+			</view>
+			<view class="emptybar" :style="'width:100%;height:'+(scrollTop>fiexdtop?'90':'0')+'rpx;'">
+			</view>
+
+			<view class="rangeList-container rowCen" :class="scrollTop>fiexdtop?'tofixed':''" :style="'top:'+(scrollTop>fiexdtop?fiexdHeight:'0')+'px;'">
+				<scroll-view class="scrollview-content" scroll-x scroll-with-animation="true">
+					<block v-for="(items,index) in navList" :key="index">
+						<view class="rangeItem" :class="nowCurrent==items.cid?'rangeItem-active':''" @tap="changeRange(items.cid)">
+							<view class="boxcontent colCenCen">
+								<view class="nameBox">
+									{{items.cname}}
+								</view>
+								<view class="border"></view>
+							</view>
+						</view>
+					</block>
+				</scroll-view>
+			</view>
+
+			<view class="goodsList-container colCen borderBox">
+				<view class="goods-content rowStaBet">
+					<view class="goods-items borderBox colCen" v-for="(items,index) in goodsList" :key='index' @click="goDetail(items)">
+						<colGoods :items="items"></colGoods>
+					</view>
+					<aLoadMore :status="loadstatus" mode="loading3" :showTitle='true' color="#999999"></aLoadMore>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import colGoods from '../../components/colGoods.vue'
+	export default {
+		components:{
+			colGoods
+		},
+		data() {
+			return {
+				pageTop: 0,
+				nowCurrent: 0,
+				scrollTop: 0,
+				navList: [],
+
+				fiexdHeight: '',
+				fiexdtop: '',
+				goodsList: [],
+				pageCurrent: 1,
+				canloadmore: false,
+				loadstatus: 'loading'
+			}
+		},
+		onLoad() {
+			this.getNav()
+		},
+		onPageScroll(e) {
+			this.scrollTop = e.scrollTop
+		},
+		onReachBottom() {
+			if (this.canloadmore) {
+				this.getData()
+			}
+		},
+		mounted() {
+			uni.createSelectorQuery().in(this).select('.fixed-container').boundingClientRect(data => {
+				console.log(data.top);
+				this.fiexdHeight = data.height
+			}).exec();
+			uni.createSelectorQuery().in(this).select('.rangeList-container').boundingClientRect(data => {
+				console.log(data.top);
+				this.fiexdtop = data.top - this.fiexdHeight
+			}).exec();
+		},
+		methods: {
+			getNav() {
+				var that = this;
+			    this.$u.api.getTopCalss({ctype:1,parentId:0}).then(e => {
+				    console.log(e);
+					if(e.code != 0)return that.$alert(e.msg)
+					e.data.list.unshift({cid:"0",cname:"鍏ㄩ儴",ctype:"1"});
+					that.navList = e.data.list;
+					that.nowCurrent = that.navList[0].cid
+					that.getData()
+				}).catch(function (err) {
+				}) 
+			},
+			getData() {
+				var that = this;
+				var cateid=that.nowCurrent=="0"?"":that.nowCurrent;
+				this.$u.api.getTbGoodsList({
+					cateId: cateid,
+					page: this.pageCurrent,
+					pageSize: 10
+				}).then(e => {
+					console.log(e);
+					if (e.code != 0) return that.$alert(e.msg)
+					var res = e.data;
+					uni.stopPullDownRefresh();
+					var res = e.data.list;
+					
+					if (res.length < 10) {
+						that.pageCurrent ++
+						that.canloadmore = false
+						that.loadstatus = 'nomarl'
+					} else {
+						that.canloadmore = true
+						that.loadstatus = 'loading'
+						that.pageCurrent ++
+					}
+					that.goodsList = that.goodsList.concat(res)
+				}).catch(function(err) {})
+			},
+			changeRange(id) {
+				this.pageCurrent = 1
+				this.canloadmore = false
+				this.nowCurrent = id
+				this.loadstatus = 'loading'
+				this.goodsList = []
+				this.getData()
+			},
+
+			goDetail(info) {
+				uni.navigateTo({
+					url: '../goods/goodsDetail?info=' + encodeURIComponent(JSON.stringify(info))
+				})
+			},
+
+			goback() {
+				uni.navigateBack({
+					delta: 1
+				})
+			},
+
+			gosearch() {
+				uni.navigateTo({
+					url: '../search/search?type=0'
+				})
+			}
+		},
+		onPullDownRefresh() {
+			this.pageCurrent = 1;
+			this.canloadmore = false;
+			this.goodsList = [];
+			this.loadstatus = 'loading';
+			this.getData()
+		}
+	}
+</script>
+
+<style lang="scss">
+	.pddsearch-wrapper {
+		width: 100%;
+
+		.fixed-container {
+			width: 100%;
+			position: fixed;
+			top: 0;
+			left: 0;
+			z-index: 110;
+			background: linear-gradient(266deg, #E7251C, #E7251C);
+
+			.headerBar-container {
+				width: 100%;
+				height: 90rpx;
+				padding: 0 32rpx;
+
+				.backicon {
+					font-size: 30rpx;
+					color: #FFFFFF;
+				}
+
+				.titleBox {
+					font-size: 32rpx;
+					font-weight: 500;
+					z-index: 10;
+					transition: all 0.5s;
+				}
+
+				.rightEmpty {
+					width: 32rpx;
+					height: 32rpx;
+				}
+			}
+		}
+
+		.pageContent-container {
+			width: 100%;
+
+			.search-region {
+				width: 100%;
+				height: 340rpx;
+				padding: 0 75rpx;
+				background: linear-gradient(266deg, #E7251C, #E7251C);
+
+				.pageTitle-bar {
+					width: 100%;
+					margin-top: 110rpx;
+
+					.leftIcon {
+						width: 75rpx;
+						height: 75rpx;
+					}
+
+					.titleInfo {
+						margin-left: 15rpx;
+
+						.topfont {
+							font-size: 36rpx;
+							font-weight: 800;
+							color: #FFFFFF;
+						}
+
+						.bottomfont {
+							font-size: 26rpx;
+							font-weight: 500;
+							color: #FFFFFF;
+						}
+					}
+				}
+
+				.searchContent {
+					width: 100%;
+					height: 80rpx;
+					border-radius: 40rpx;
+					background-color: #FFFFFF;
+					margin-top: 40rpx;
+					padding: 0 10rpx;
+
+					.leftcontent {
+						margin-left: 25rpx;
+
+						.search-icon {
+							font-size: 32rpx;
+							font-weight: 500;
+							color: #999999;
+							margin-right: 25rpx;
+						}
+
+						.tipsfont {
+							font-size: 26rpx;
+							font-weight: 500;
+							color: #999999;
+						}
+					}
+
+					.right-btn {
+						width: 116rpx;
+						height: 60rpx;
+						background: linear-gradient(266deg, #FF012E, #FF1017);
+						border-radius: 30rpx;
+						font-size: 24rpx;
+						font-weight: 500;
+						color: #FFFFFF;
+					}
+				}
+			}
+
+			.rangeList-container {
+				width: 100%;
+				height: 80rpx;
+				padding-left: 32rpx;
+				z-index: 101;
+
+				.scrollview-content {
+					width: 100%;
+					height: 100%;
+					white-space: nowrap;
+
+					.rangeItem {
+						display: inline-flex;
+						margin-right: 45rpx;
+						height: 100%;
+
+						.boxcontent {
+							height: 100%;
+
+							.nameBox {
+								font-size: 30rpx;
+								font-weight: 500;
+								color: #333333;
+							}
+
+							.border {
+								width: 60%;
+								height: 2rpx;
+								background: transparent;
+							}
+						}
+					}
+
+					.rangeItem-active {
+						.boxcontent {
+							.nameBox {
+								font-size: 32rpx;
+							}
+
+							.border {
+								background: #FF012E;
+								margin-top: 8rpx;
+							}
+						}
+					}
+				}
+			}
+
+			.tofixed {
+				position: fixed;
+				z-index: 100;
+				background-color: #FFFFFF;
+			}
+
+			.goodsList-container {
+				z-index: 1;
+				width: 100%;
+				padding: 0 32rpx;
+				margin-top: 10rpx;
+
+				.goods-content {
+					width: 100%;
+					flex-wrap: wrap;
+
+					.goods-items {
+						width: 336rpx;
+						height: 526rpx;
+						margin-bottom: 20rpx;
+
+						.items-container {
+							width: 336rpx;
+							height: 100%;
+							overflow: hidden;
+							border-radius: 8rpx;
+							background-color: #FFFFFF;
+
+							.image-container {
+								width: 100%;
+								height: 336rpx;
+							}
+
+							.goodsInfo {
+								width: 100%;
+								height: 190rpx;
+								margin-top: 10rpx;
+								padding: 0 10rpx 10rpx 10rpx;
+
+								.topgoodsname-box {
+									width: 100%;
+
+									.goodsName-box {
+										width: 100%;
+
+										.typeIcon-content {
+											width: 60rpx;
+											height: 24rpx;
+											margin-right: 5rpx;
+										}
+
+										.goodsText {
+											width: 250rpx;
+											font-size: 28rpx;
+											line-height: 34rpx;
+											font-weight: 400;
+											color: #333333;
+											white-space: nowrap;
+											overflow-x: hidden;
+											text-overflow: ellipsis;
+										}
+									}
+
+									.couponInfo-bar {
+										width: 100%;
+										margin-top: 20rpx;
+
+										.couponbox {
+											width: 100rpx;
+											height: 30rpx;
+											line-height: 30rpx;
+											text-align: center;
+											background: url(../../static/images/goods/couponbac.png)no-repeat;
+											background-size: 100% 100%;
+											font-size: 20rpx;
+											font-weight: 500;
+											color: #FF4242;
+											margin-right: 10rpx;
+										}
+
+										.backPrice {
+											width: 100rpx;
+											height: 30rpx;
+											background: linear-gradient(-90deg, #7619EC, #A429F3);
+											border-radius: 5rpx;
+											font-size: 20rpx;
+											font-weight: 500;
+											text-align: center;
+											line-height: 30rpx;
+											color: #FFFFFF;
+										}
+									}
+								}
+
+								.goodsPrice-goodSale {
+									width: 100%;
+
+									.goods-price {
+										width: 100%;
+										font-size: 20rpx;
+										font-weight: 500;
+										color: #999999;
+										line-height: 34rpx;
+
+										.font {
+											font-weight: 500;
+											color: #999999;
+											line-height: 32rpx;
+											margin-right: 10rpx;
+										}
+
+										.rmb {
+											font-weight: bold;
+											color: #FF4242;
+											line-height: 32rpx;
+										}
+
+										.price {
+											color: #FF4242;
+											font-weight: 500;
+											font-size: 28rpx;
+										}
+									}
+
+									.saleNum-box {
+										width: 100%;
+										font-size: 20rpx;
+										font-weight: 400;
+										line-height: 34rpx;
+										color: #999999;
+									}
+
+									.shopinfo-box {
+										width: 100%;
+										font-size: 20rpx;
+										font-weight: 400;
+										line-height: 34rpx;
+										color: #999999;
+									}
+								}
+							}
+						}
+
+					}
+				}
+			}
+		}
+	}
+</style>
diff --git a/uniapp/pages/mine/inviteFriends.vue b/uniapp/pages/mine/inviteFriends.vue
index 56afdd4..20a89da 100644
--- a/uniapp/pages/mine/inviteFriends.vue
+++ b/uniapp/pages/mine/inviteFriends.vue
@@ -214,6 +214,7 @@
 
 			async makeCode() {
 				var globalData = util.getCacheSync('appInfo')
+				console.log(globalData)
 				//var txt = globalData.appAndroidDownUrl
 				var txt = globalData.invite_url + "?code="+this.user.invitation_code
 				console.log(txt)
diff --git a/uniapp/pages/mine/mine.vue b/uniapp/pages/mine/mine.vue
index dd7451d..05781b9 100644
--- a/uniapp/pages/mine/mine.vue
+++ b/uniapp/pages/mine/mine.vue
@@ -135,8 +135,8 @@
 				</swiper>
 			</view>
 
-			<view style="justify-content:end;padding-left:10px" class="matter-tranform-container rowCenCen" v-if="wuLiaoList.length>0">
-				<!-- <view class="pushing-matter rowCen" @tap="goUrl(wuLiaoList[0])">
+		<!--	<view style="justify-content:end;padding-left:10px" class="matter-tranform-container rowCenCen" v-if="wuLiaoList.length>0">
+				 <view class="pushing-matter rowCen" @tap="goUrl(wuLiaoList[0])">
 					<view class="leftIteminfo">
 						<view class="itemName">
 							{{wuLiaoList[0].mname}}
@@ -149,7 +149,7 @@
 						<image :src="wuLiaoList[0].image" mode="aspectFill"></image>
 					</view>
 				</view>
-				<view class="centerBorder"></view> -->
+				<view class="centerBorder"></view> 
 				<view  class="pushing-matter rowCen" @tap="goUrl(wuLiaoList[1])">
 					<view class="leftIteminfo">
 						<view class="itemName">
@@ -165,7 +165,7 @@
 				</view>
 				 
 			
-			</view>
+			</view>-->
 
 			<view class="commonFunctions-container" v-if="cygnList.length>0">
 				<view class="card-title">
diff --git a/uniapp/pages/rankinglist/fengqiang.vue b/uniapp/pages/rankinglist/fengqiang.vue
new file mode 100644
index 0000000..ea3a51d
--- /dev/null
+++ b/uniapp/pages/rankinglist/fengqiang.vue
@@ -0,0 +1,65 @@
+<template>
+	<view>
+		<web-view :webview-styles="webviewStyles" :src="webviewUrl" @message='received'></web-view>
+	</view>
+</template>
+
+<script>
+	var wv
+	export default {
+		data() {
+			return {
+				webviewUrl: '',
+				webviewStyles: {
+					progress: {
+						color: '#EE1B14'
+					}
+				},
+			}
+		},
+		onLoad(options) {
+			//console.log(options);
+			const value = uni.getStorageSync('userInfo');
+			console.log(value.token);
+			this.webviewUrl = encodeURI('http://dfgapp.ushopvip.com/html/fengqiangbang.html?token='+value.token);
+		},
+		onReady() {
+		  this.clearMuiBack();
+		},
+		methods: {
+			received(e) {
+				console.log(e.detail.data[0].type)
+				if(e.detail.data[0].type=='getToken'){
+					const token = uni.getStorageSync('userInfo').token;
+					var currentWebview = this.$scope.$getAppWebview()
+					var wv = currentWebview.children()[0]
+					wv.evalJS('localStorage.setItem("ZZTOKEN",' + JSON.stringify(token) + ')');
+				}
+			},
+			
+			// 鍏抽棴mui杩斿洖
+			  clearMuiBack() {
+			    // #ifdef APP-PLUS
+			    var currentWebview = this.$scope.$getAppWebview().children()[0];
+			    //鐩戝惉娉ㄥ叆鐨刯s
+			    currentWebview.addEventListener("loaded", function() {
+			      currentWebview.evalJS("mui.init({keyEventBind: {backbutton: false }});");
+			    });
+			    // #endif
+			  },
+			  
+		},
+		onNavigationBarButtonTap(e) {
+			// #ifdef APP-PLUS
+			const currentWebview = this.$scope.$getAppWebview(); //姝ゅ璞$浉褰撲簬html5plus閲岀殑plus.webview.currentWebview()銆傚湪uni-app閲寁ue椤甸潰鐩存帴浣跨敤plus.webview.currentWebview()鏃犳晥锛岄潪v3缂栬瘧妯″紡浣跨敤this.$mp.page.$getAppWebview()
+			var wv = currentWebview.children()[0]
+			wv.reload();
+			// #endif
+			console.log(JSON.stringify(e))
+		},
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/uniapp/utils/http.api.js b/uniapp/utils/http.api.js
index 197cc3d..e9bee05 100644
--- a/uniapp/utils/http.api.js
+++ b/uniapp/utils/http.api.js
@@ -96,6 +96,7 @@
 let getDyGoodsDetailUrl = 'api/taoke/get_dy_detail';
 let getPrivilegeShareLinkUrl = "api/taoke/get_privilege_share_link";
 let eleStoreListUrl = "api/taoke/ele_store_list";
+let getHdkCategoryListUrl="/api/taoke/get_hdk_category_list";
 
 // 姝ゅ绗簩涓弬鏁皏m锛屽氨鏄垜浠湪椤甸潰浣跨敤鐨則his锛屼綘鍙互閫氳繃vm鑾峰彇vuex绛夋搷浣滐紝鏇村鍐呭璇﹁uView瀵规嫤鎴櫒鐨勪粙缁嶉儴鍒嗭細
 // https://uviewui.com/js/http.html#%E4%BD%95%E8%B0%93%E8%AF%B7%E6%B1%82%E6%8B%A6%E6%88%AA%EF%BC%9F
@@ -198,8 +199,9 @@
 	let getDyGoodsDetail = (params = {}) => vm.$u.post(getDyGoodsDetailUrl, params);  	//鎶栭煶璇︽儏
 	let getPrivilegeShareLink = (params = {}) => vm.$u.post(getPrivilegeShareLinkUrl, params); 
 	let eleStoreList = (params = {}) => vm.$u.post(eleStoreListUrl, params); 
+	let getHdkCategoryList= (params = {}) => vm.$u.post(getHdkCategoryListUrl, params); 
 	// 灏嗗悇涓畾涔夌殑鎺ュ彛鍚嶇О锛岀粺涓�鏀捐繘瀵硅薄鎸傝浇鍒皏m.$u.api(鍥犱负vm灏辨槸this锛屼篃鍗硉his.$u.api)涓�
-	vm.$u.api = {eleStoreList,getPrivilegeShareLink,getDyGoodsDetail,bindMobileLogin,getTopMessId,changePwd,comminInt,wxapplogin,getTopCalss,getBanner,getHomeMenu,getSuperClass,getMQD,getGoodThing,login,sendSms,mobileLogin,setPwd,getUserInfo,getTalentInfo,getMessageList,getGoodsDetail,getPrivilegeLink,getSimilerGoods,getJdsDetail,getPddDetail,getM,getWphGoodsDetail,addCollect,delCollect,hotKey,suggestion,goodsSearch,activityLink,unionAct,singlePageLink,checkPddAuth,getPddAuth,getPineGoods,jdGoodsList,optimusMaterial,pddGoodsList,brandList,brandInfo,wphGoodsList,meituanAct,eleAct,eleShangjin,userHomemenu,getAppVersion,userBrowse,delBrowse,activitySingle,userCollect,bdHomemenu,getCity,coordinate,cityCate,searchDeals,getCityId,seckillShowinfo,seckillList,identifyGoods,changeMobile,bindInvitation,getInviteInfo,getEstimateAmount,fansList,getFansCount,getHelpType,getHelpList,getHelpDetail,getWpanurl,getChainTurning,superDiscountGoods,getHistory,getTbGoodsList,cateRankList,getUpgradeInfo,getEquityCard,levelApply,orderList,userProfit,bindZfb,withdraw,getBalanceLog,getPublisher,getAlbum,likeAlbum,albumDetail,anchorFollow,myFollowAlbum,feedback,userCancel,profile,bindWechat,unboundWechat};
+	vm.$u.api = {getHdkCategoryList,eleStoreList,getPrivilegeShareLink,getDyGoodsDetail,bindMobileLogin,getTopMessId,changePwd,comminInt,wxapplogin,getTopCalss,getBanner,getHomeMenu,getSuperClass,getMQD,getGoodThing,login,sendSms,mobileLogin,setPwd,getUserInfo,getTalentInfo,getMessageList,getGoodsDetail,getPrivilegeLink,getSimilerGoods,getJdsDetail,getPddDetail,getM,getWphGoodsDetail,addCollect,delCollect,hotKey,suggestion,goodsSearch,activityLink,unionAct,singlePageLink,checkPddAuth,getPddAuth,getPineGoods,jdGoodsList,optimusMaterial,pddGoodsList,brandList,brandInfo,wphGoodsList,meituanAct,eleAct,eleShangjin,userHomemenu,getAppVersion,userBrowse,delBrowse,activitySingle,userCollect,bdHomemenu,getCity,coordinate,cityCate,searchDeals,getCityId,seckillShowinfo,seckillList,identifyGoods,changeMobile,bindInvitation,getInviteInfo,getEstimateAmount,fansList,getFansCount,getHelpType,getHelpList,getHelpDetail,getWpanurl,getChainTurning,superDiscountGoods,getHistory,getTbGoodsList,cateRankList,getUpgradeInfo,getEquityCard,levelApply,orderList,userProfit,bindZfb,withdraw,getBalanceLog,getPublisher,getAlbum,likeAlbum,albumDetail,anchorFollow,myFollowAlbum,feedback,userCancel,profile,bindWechat,unboundWechat};
 }
 
 export default {

--
Gitblit v1.9.3