活动金查询活动列表添加商户号查询

pages/index/activity_Funds_activityList/activity_Funds_activityList.vue

@@ -158,7 +158,8 @@
 				let datas = {
 					status: this.statusid,
 					pageNum: pagenum,
-					pageSize: this.pageSize
+					pageSize: this.pageSize,
+					merNo:app.globalData.userInfo.mer.merNo,
 				}
 				getActivityList(datas).then(res => {
 					uni.hideLoading();

pages/index/merchant-details/merchant-details.vue

@@ -93,7 +93,7 @@
 					<button class="btns mart10 margle10" @click.stop="jumpBindScan(item.id,1)">绑定二维码</button>
 					<button class="btns mart10 margle10" @click.stop="jumpBindScan(item.id,2)">二维码列表</button>
 					<button class="btns mart10 margle10" @click.stop="jumpService(item.id)">绑定设备</button>
-					<button class="btns mart10 margle10" @click.stop="jumpGroupService(item.id)">团购配置</button>
+					<!-- <button class="btns mart10 margle10" @click.stop="jumpGroupService(item.id)">团购配置</button> -->
 					<!-- <button class="btns mart10 marRight10" @click.stop="jumpService(item.id,2)">设备列表</button> -->
 				</view>
 				<view class="lin10"></view>