Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

# Conflicts:
#	pages/business/record.vue

pages/business/businessNew.vue

@@ -253,7 +253,8 @@
 				this.isShowAlert = true;
 			} else {
 				uni.navigateTo({
-					url: 'myAttention'
+					url: 'myAttention?selectType='+'关注'
+					
 				})
 			}
 
@@ -361,9 +362,12 @@
 					this.isShowAlert = true;
 
 				} else {
-					uni.navigateTo({
-						url: 'release'
-					})
+					if(!uni.getStorageSync('userInfo').transactionStatus||uni.getStorageSync('userInfo').transactionStatus&&uni.getStorageSync('userInfo').transactionStatus!='禁止发布'){
+						uni.navigateTo({
+							url: 'release'
+						})
+					}
+					
 				}
 
 			},

pages/business/myAttention.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="content1">
-			<u-search placeholder="搜索用户名称" v-model="keyword" :show-action='false' bg-color="#F5F6FA"></u-search>
+			<u-search placeholder="搜索用户名称" v-model="keyword" :show-action='false' @search='keywordsearch' bg-color="#F5F6FA"></u-search>
 		</view>
 
 		<mescroll-body ref="mescrollRef" @init="mescrollInit" top="0" @down="downCallback" :up="upOption"
@@ -59,6 +59,7 @@
 				inputStyle: {
 					// "padding-left": '30rpx'
 				},
+				selectType:'',
 				upOption: {
 					// page: {
 					// 	num: 0, // 当前页码,默认0,回调之前会加1,即callback(page)会从1开始
@@ -84,7 +85,9 @@
 			console.log("userInfo", userInfo)
 
 		},
-		onLoad(options) {},
+		onLoad(options) {
+			this.selectType=options.selectType
+		},
 
 
 		methods: {
@@ -119,6 +122,10 @@
 					url: 'release'
 				})
 			},
+			keywordsearch(e){
+				this.keyword=e
+				this.upCallback({size:10,num:1})
+			},
 			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
 			upCallback(page) {
 				uni.showLoading({
@@ -137,6 +144,7 @@
 						placeDelivery: this.selectPlace,
 						tranType: this.selectType,
 						userIdFollow: this.userInfo.id,
+						followedId:this.keyword,
 						nowUserId: this.userInfo.id
 					}
 				} else {

pages/business/record.vue

@@ -38,10 +38,10 @@
 						<view class="del btn" @click="del(item)">
 							删除
 						</view>
-						<view class="edit btn" @click="edit(item)">
+						<view v-if="item.status!='待审核'" class="edit btn" @click="edit(item)">
 							编辑
 						</view>
-						<view class="edit btn" @click="refresh(item)">
+						<view v-if="item.status!='已驳回'&&item.status!='待审核'" class="edit btn" @click="refresh(item)">
 							刷新
 						</view>
 					</view>
@@ -187,6 +187,7 @@
 					currentPage: page.num,
 					userId: this.userInfo.id,
 				}
+
 				await this.$api.doRequest('get', '/transactionExchangeInfo/selectTransactionExchangeInfo', _obj).then(
 					res => {
 						console.log(res.data)
@@ -202,7 +203,7 @@
 							// 	this.goods[i].imgList = this.goods[i].urlImg.split(',')
 							// }
 						}
-						uni.hideLoading()
+						// uni.hideLoading()
 					})
 				if (this.goods.length > 0) {
 					for (let i = 0; i < this.goods.length; i++) {
@@ -222,6 +223,7 @@
 
 					}
 				}
+
 			},
 			//点击空布局按钮的回调
 			emptyClick() {
@@ -290,7 +292,7 @@
 		margin: 0 20rpx;
 
 		.list-item {
-			padding: 20rpx;
+			padding: 26rpx 17rpx;
 			background: #fff;
 			margin-bottom: 20rpx;
 			border-radius: 20rpx;
@@ -299,7 +301,6 @@
 
 				.head-img {
 					width: 72rpx;
-					background-color: red;
 					border-radius: 8rpx;
 					margin-right: 22rpx;
 				}
@@ -330,8 +331,8 @@
 						}
 
 						.color3 {
-							font-size: 28rpx;
-							/* color: #AFB3BF; */
+							font-size: 24rpx;
+							color: #AFB3BF;
 							margin-left: 14rpx;
 
 						}
@@ -339,7 +340,9 @@
 				}
 
 				.right {
-					/* padding: 10rpx 20rpx; */
+					padding: 10rpx 20rpx;
+					border: 1px solid #CDCDCD;
+					border-radius: 50rpx;
 				}
 			}
 
@@ -359,7 +362,7 @@
 				margin-top: 18rpx;
 				display: flex;
 				align-items: center;
-				/* justify-content: space-between; */
+				justify-content: space-between;
 				flex-wrap: wrap;
 				/* background: #bbb; */
 

pages/task/audit/universalityAudit.vue

@@ -1,5 +1,5 @@
 <template>
-	<view :style='{"margin-bottom":dataobj.taskId?"280rpx":"180rpx"}'>
+	<view style='margin-bottom:280rpx;'>
 		<view class="topInfo">
 			<view class="topInfo-item">
 				<view class="flex info">
@@ -64,7 +64,7 @@
 				</view>
 				</u-form-item>
 			</u-form>
-			<u-form ref="uForm">
+			<u-form style='padding-bottom: 180rpx;' ref="uForm">
 				<view class="form_top">审批流</view>
 				<view class="content2">
 					<view v-for="(item,index) in auditList" :key='index' class="audit">