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

components/selectAddress.vue

@@ -188,5 +188,6 @@
 <style lang="scss" scoped>
 	.text {
 		display: inline-block;
+		margin: 0;
 	}
 </style>

pages.json

@@ -1696,7 +1696,16 @@
 			}
 
 		}
-	],
+	    ,{
+            "path" : "pages/reimbursement/addaccessory",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+    ],
 	"subpackages": [{
 			"root": "pageA",
 			"pages": [{

pages/business/businessNew.vue

@@ -483,7 +483,7 @@
 	}
 </script>
 
-<style lang='scss'>
+<style lang='scss' scoped>
 	page,
 	.content {
 		background: #F5F6FA;
@@ -683,18 +683,17 @@
 		}
 	}
 
-	/deep/.u-content {
-		padding-left: 170rpx;
+	/deep/.u-search .u-content {
+		padding-left: 120rpx;
 	}
 
-	.place {
+.place {
 		display: flex;
 		align-items: center;
 		left: 28rpx;
 		position: absolute;
 		font-weight: 700;
 	}
-
 	.uni-page-head-ft {
 		margin-right: 40rpx;
 	}

pages/reimbursement/the_reimbursement.vue

@@ -42,6 +42,7 @@
 						v-if="item.status=='已驳回'">删除</view>
 					<view class="wenzi1 audit" @click="requestFunds(3,item)"
 						v-if="item.status=='已驳回'">编辑</view>
+						<!-- <view class="wenzi1 audit" @click="gofujian(item)">补充附件</view> -->
 					<view class="wenzi1 audit" @click="getRequestFunds(1,item)">查看</view>
 				</view>
 			</view>
@@ -92,6 +93,12 @@
 			}
 		},
 		methods: {
+			gofujian(val){
+				uni.navigateTo({
+					url: '/pages/reimbursement/addaccessory?id=' + val.id + "&expensesType=" + val
+						.expensesType
+				})
+			},
 			getList() {
 				uni.showLoading({
 					title: '加载中',