ccj hace 3 años
padre
commit
8ab2cd42fd

+ 9 - 4
components/uview-ui/components/u-back-top/u-back-top.vue

@@ -7,7 +7,8 @@
 		opacity: opacity
 	}, customStyle]">
 		<view class="u-back-top__content" v-if="!$slots.default && !$slots.$default">
-			<u-icon @click="backToTop" :name="icon" :custom-style="iconStyle"></u-icon>
+			<!-- <u-icon @click="backToTop" :name="icon" :custom-style="iconStyle"></u-icon> -->
+			<image class="totop" @click="backToTop" src="../../../../static/img/jiaoyi/totop.png"></image>
 			<view class="u-back-top__content__tips">
 				{{tips}}
 			</view>
@@ -124,7 +125,11 @@
 
 <style lang="scss" scoped>
 	@import "../../libs/css/style.components.scss";
-	
+	.totop{
+		width: 90rpx;
+		height: 90rpx;
+		z-index: 10;
+	}
 	.u-back-top {
 		width: 80rpx;
 		height: 80rpx;
@@ -133,11 +138,11 @@
 		@include vue-flex;
 		flex-direction: column;
 		justify-content: center;
-		background-color: #E1E1E1;
+		// background-color: #ffffff;
 		color: $u-content-color;
 		align-items: center;
 		transition: opacity 0.4s;
-		
+		// box-shadow: 0 5upx 10upx rgba(134, 134, 134, 0.1);
 		&__content {
 			@include vue-flex;
 			flex-direction: column;

+ 2 - 2
manifest.json

@@ -2,8 +2,8 @@
     "name" : "易粮易运",
     "appid" : "__UNI__7297DA2",
     "description" : "易粮易运——为天下粮食人服务的App",
-    "versionName" : "1.1.5",
-    "versionCode" : 115,
+    "versionName" : "1.1.6",
+    "versionCode" : 116,
     "transformPx" : false,
     /* SDK配置 */
     "quickapp" : {},

+ 1 - 2
pages/business/business.vue

@@ -93,8 +93,7 @@
 		<view style='height:65vh;background:#F5F6FA;line-height:65vh;text-align:center;' v-if='buyInfo.length==0'>
 			当前暂无结果
 		</view>
-		<u-back-top :scroll-top="scrollTop" tips="顶部" :custom-style="{backgroundColor: '#a0cfff',color: '#2979ff'}"
-			:iconStyle="{color: '#2979ff',fontSize: '34rpx'}" mode="square" icon="arrow-up"></u-back-top>
+		<u-back-top :scroll-top="scrollTop" mode="circle" icon="arrow-upward"></u-back-top>
 
 	</view>
 </template>

+ 10 - 3
pages/grain_pulse/dynamic.vue

@@ -56,6 +56,7 @@
 		<view style='height:12vh;background:#F5F6FA;line-height:12vh;text-align:center;' v-if='releaseList.length == 0'>
 			当前暂无结果
 		</view>
+		<u-back-top :scroll-top="scrollTop" mode="circle" icon="arrow-upward"></u-back-top>
 	</view>
 </template>
 
@@ -78,7 +79,8 @@
 					backgroundImage: "none",
 					paddingTop: "0",
 					marginTop: "20rpx"
-				}
+				},
+				scrollTop: 0,
 			}
 		},
 		computed: {
@@ -108,12 +110,16 @@
 			this.portraits = this.userInfo.avatarUrl
 			this.getData()
 		},
+		onPageScroll(e) {
+			this.scrollTop = e.scrollTop;
+		},
 		methods: {
 			getData() {
 				this.$api.doRequest('get', '/settledCompanyDynamics/selectSettledCompanyDynamicsPage', {
 						currentPage: 1,
 						pageSize:10,
-						searchKeyWord: this.keyword
+						searchKeyWord: this.keyword,
+						searchType:2
 					})
 					.then(res => {
 						if (res.data.code == 200) {
@@ -135,7 +141,8 @@
 				this.$api.doRequest('get', '/settledCompanyDynamics/selectSettledCompanyDynamicsPage', {
 						currentPage: this.currentPage,
 						pageSize: this.pageSize,
-						searchKeyWord: this.keyword
+						searchKeyWord: this.keyword,
+						searchType:2
 					})
 					.then(res => {
 						if (res.data.code == 200) {

+ 10 - 5
pages/grain_pulse/home.vue

@@ -71,7 +71,7 @@
 			<image style='width:56.5px;height:28px;' src="../../static/img/liangmai/ruzhu.png" mode=""></image>
 			<view class='enter-content'>入驻</view>
 		</view>
-
+		<u-back-top :scroll-top="scrollTop" mode="circle" icon="arrow-upward"></u-back-top>
 	</view>
 </template>
 
@@ -125,12 +125,16 @@
 					}
 				],
 				notlist:false,
-				datalist: []
+				datalist: [],
+				scrollTop: 0,
 			}
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo'])
 		},
+		onPageScroll(e) {
+			this.scrollTop = e.scrollTop;
+		},
 		onPullDownRefresh() {
 		    this.getList()
 			this.isLoadMore = false
@@ -197,8 +201,9 @@
 				
 				this.$api.doRequest('get', '/settledCompanyDynamics/selectSettledCompanyDynamicsPage', {
 						currentPage: 1,
-						pageSize: 4,
-						searchKeyWord: this.keyword
+						pageSize: 3,
+						searchKeyWord: this.keyword,
+						searchType:2
 					})
 					.then(res => {
 						if (res.data.code == 200) {
@@ -536,7 +541,7 @@
 	.enter {
 		position: fixed;
 		right: 0;
-		top: 80%;
+		top: 70%;
 		width: 56.5px;
 		height: 28px;
 	}

BIN
static/img/jiaoyi/totop.png