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

pages/public/login_account_number.vue

@@ -125,21 +125,21 @@
 								// 	helper.getListByUserId()
 								// })
 							}
+							that.$store.commit('login', res.data.data)
+							var name = 'userInfo';
+							var value = res.data.data;
+							that.$store.commit('$uStore', {
+								name,
+								value
+							});
+							// that.liangxinLogin()
 							
+							uni.switchTab({
+								url: '/pages/sale/information'
+							});
+							uni.hideLoading()
 						})
-						that.$store.commit('login', res.data.data)
-						var name = 'userInfo';
-						var value = res.data.data;
-						that.$store.commit('$uStore', {
-							name,
-							value
-						});
-						// that.liangxinLogin()
 						
-						uni.switchTab({
-							url: '/pages/sale/information'
-						});
-						uni.hideLoading()
 					}else{
 						uni.hideLoading()
 						uni.showToast({

pages/task/audit/warehouse_warrant.vue

@@ -53,6 +53,10 @@
 				<view class="left">合计金额（元）</view>
 				<view class="right">{{auditInfo.requestFundsTotal}}</view>
 			</view>
+			<view class="row">
+				<view class="left">收购名头</view>
+				<view class="right">{{auditInfo.purchaser}}</view>
+			</view>
 			<!-- 	<view class="row">
 				<view class="left">仓库名称</view>
 				<view class="right">{{auditInfo.warehouseName}}</view>

pages/task/audit/warehouse_warrant_detail.vue

@@ -53,6 +53,10 @@
 				<view class="left">合计金额（元）</view>
 				<view class="right" style='color:red;'>{{auditInfo.requestFundsTotal}}</view>
 			</view>
+			<view class="row">
+				<view class="left">收购名头</view>
+				<view class="right">{{auditInfo.purchaser}}</view>
+			</view>
 			<!-- 	<view class="row">
 				<view class="left">仓库名称</view>
 				<view class="right">{{auditInfo.warehouseName}}</view>