交易大厅以及商户设置

pages.json

@@ -128,25 +128,26 @@
 				"enablePullDownRefresh": false
 			}
 
-		}, {
-			"path": "uni_modules/guyue-updater/pages/updater",
-			"style": {
-				"app-plus": {
-					"animationDuration": 200,
-					"animationType": "fade-in",
-					"background": "transparent",
-					"backgroundColorTop": "transparent",
-					"bounce": "none",
-					"popGesture": "none",
-					"scrollIndicator": false,
-					"titleNView": false
-				},
-				"backgroundColor": "transparent",
-				"disableScroll": true,
-				"navigationStyle": "custom"
-			}
 		}
-	],
+	,{
+    "path": "uni_modules/guyue-updater/pages/updater",
+    "style": {
+        "app-plus": {
+            "animationDuration": 200,
+            "animationType": "fade-in",
+            "background": "transparent",
+            "backgroundColorTop": "transparent",
+            "bounce": "none",
+            "popGesture": "none",
+            "scrollIndicator": false,
+            "titleNView": false
+        },
+        "backgroundColor": "transparent",
+        "disableScroll": true,
+        "navigationStyle": "custom"
+    }
+}
+],
 	"subPackages": [{
 			"root": "pages/goods_cate",
 			"name": "goods_cate",
@@ -1126,13 +1127,13 @@
 					"path": "transactionApplication/index",
 					"style": {
 						"navigationBarTitleText": "交易申请",
-						"enablePullDownRefresh": true
+						"enablePullDownRefresh": false
 					}
 				},{
 					"path": "transactionApplication/application",
 					"style": {
 						"navigationBarTitleText": "申请记录",
-						"enablePullDownRefresh": true
+						"enablePullDownRefresh": false
 					}
 				},
 				{
@@ -1636,7 +1637,7 @@
 				"iconPath": "static/tabbar_icon/c.png",
 				"selectedIconPath": "static/tabbar_icon/c-a.png",
 				"text": "发布"
-
+			
 			},
 			{
 				"pagePath": "pages/supply_chains/supply_chains",
@@ -1652,7 +1653,7 @@
 				"text": "我的"
 			}
 		]
-
+		
 
 
 

pages/gather/gather.vue

@@ -73,9 +73,7 @@
 			</view>
 		</view>
 
-		<view class="" v-if="jurisdiction == false && isShow == false">
-			<emptyPage title="暂无信息"></emptyPage>
-		</view>
+	
 		<u-picker :defaultIndex="[0,0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
 			@cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
 		<!-- <m-tabbar native>
@@ -91,7 +89,7 @@
 <script>
 	import Cache from '@/utils/cache';
 	import mTabbar from '@/components/m-tabbar/m-tabbar.vue'
-	import emptyPage from '@/components/emptyPage.vue';
+
 	import zbpSwiper from '@/components/zbpSwiper'
 	import {
 		getArea,
@@ -127,8 +125,8 @@
 	export default {
 		components: {
 			mTabbar,
-			zbpSwiper,
-			emptyPage
+			zbpSwiper
+		
 		},
 		data() {
 			return {

pages/moreProject/moreProject.vue

@@ -350,6 +350,7 @@
 								<text class="text">商户设置</text>
 							</view>
 
+
 							<view class="examine" v-if="userInfoData.mer_info.setting_status==1"	@click="navigator(`/pages/product/transactionApplication/index?mer_id=${mer_id}&business_status=${userInfoData.mer_info.business_status}`, '交易申请')">
 								<image class="icon_img" src="@/static/images/jy.png" mode="aspectFill">
 								</image>

pages/product/basicSet.vue

@@ -173,6 +173,7 @@
 
 <script>
 	import {
+		navigateBack,
 		Toast
 	} from '@/libs/uniApi.js'
 	import {
@@ -396,11 +397,12 @@
 					Toast(res.message)
 					setTimeout(() => {
 						uni.switchTab({
-							url: '/pages/gather/gather',
+							url: '/pages/moreProject/moreProject',
 							fail: (err) => {
 								// console.log('err', err);
 							}
 						});
+						
 					}, 2000)
 				}).catch(err => {
 					Toast(err)
@@ -422,28 +424,36 @@
 				});
 			},
 			seleckImage(i) {
-				let that = this
-				uni.chooseImage({
-					count: 1,
-					sizeType: ['original', 'compressed'],
-					sourceType: ['album', 'camera'],
-					success: function(res) {
-						console.log(res);
-						uni.showLoading({
-							title: '上传中...'
-						})
-						uploads(res.tempFilePaths[0], 'img').then(res => {
-							that.images[i].img = res
-							uni.hideLoading()
-						}).catch(err => {
-							Toast('添加失败')
-							uni.hideLoading()
-						})
-					},
-					fail: function(err) {
-						Toast('添加失败')
-					}
+				let that = this;
+				that.$util.uploadImageOne('upload/image', function(res) {
+					// console.log(res)
+					that.images[i].img = res.data.path
 				});
+				// let that = this
+				// uni.chooseImage({
+				// 	count: 1,
+				// 	sizeType: ['original', 'compressed'],
+				// 	sourceType: ['album', 'camera'],
+				// 	success: function(res) {
+					
+				// 		uni.showLoading({
+				// 			title: '上传中...'
+				// 		})
+				// 			console.log(res.tempFilePaths[0],'22222222');
+				// 		uploads(res.tempFilePaths[0], 'img').then(res => {
+				// 				console.log(res,'3333');
+				// 			that.images[i].img = res
+				// 			uni.hideLoading()
+				// 		}).catch(err => {
+				// 			Toast('添加失败')
+				// 			uni.hideLoading()
+				// 		})
+				// 	},
+				// 	fail: function(err) {
+				// 		Toast('添加失败')
+				// 	}
+				// });
+				
 			},
 			delImg(i) {
 				let that = this

pages/product/transactionApplication/application.vue

@@ -22,7 +22,9 @@
 						{{item.type_name}}
 					</view>
 				</view>
-
+                 <view class="" v-if="item.fail_msg" style="margin-top: -50rpx;color: red;">
+                 	拒绝原因：{{item.fail_msg}}
+                 </view>
 				<view class="content_detail">
 					<view class="" style="display: flex;">
 						<view style="width:150rpx;"> 申请人：</view>

pages/product/transactionApplication/index.vue

@@ -24,7 +24,7 @@
 			<view class="bottombtn_no" @click="noagree">拒绝</view>
 			<view class="bottom_agree" @click="agree">同意</view>
 		</view>
-		<view class="content-bottom" v-if="type==1">
+		<view class="content-bottom" v-if="type==1||type==3">
 			<view class="bottom_agree" @click="agree">重新申请</view>
 		</view>
 	</view>
@@ -57,6 +57,7 @@
 		},
 		onLoad(e) {
 			this.type = e.business_status
+			
 			this.list()
 		},
 		methods: {
@@ -85,6 +86,7 @@
 				uni.navigateTo({
 					url: '/pages/moreProject/moreProject'
 				})
+				
 			},
 			//同意申请
 			agree() {