Merge branch 'ats' into ats2

1

pages/user/historyDetail.vue

@@ -166,11 +166,11 @@
 						  	{{item.AmountMoney?item.AmountMoney:0}}
 						  </view>
 					  </view>
-						<view class="itemWorkHoursBox" v-if="itemWorkHours&&itemWorkHours" :class="{nopb:ItemComment&&item.Comment}">
+						<view class="itemWorkHoursBox" v-if="itemWorkHours||itemPrice" :class="{nopb:ItemComment&&item.Comment}">
 							<view class="itemWorkHours" v-if="itemWorkHours">
 								工时：<span class="SalePrice">{{item.SaleQty}}</span> 
 							</view>
-							<view class="itemPrice" v-if="itemWorkHours">
+							<view class="itemPrice" v-if="itemPrice">
 								单价：<span class="SalePrice">{{item.SalePrice}}</span>
 							</view>
 						</view>
@@ -208,7 +208,7 @@
 							</view>
 							<!-- <view class="qty" v-if="goodsNumber">x{{item.SaleQty}}</view> -->
 						</view>
-						<view class="itemWorkHoursBox" v-if="itemWorkHours&&itemWorkHours" :class="{nopb:GoodsComment&&item.Comment}">
+						<view class="itemWorkHoursBox" v-if="goodsPrice||goodsNumber" :class="{nopb:GoodsComment&&item.Comment}">
 							<view class="itemWorkHours" v-if="goodsNumber">
 								数量：<span class="SalePrice">{{item.SaleQty}}<span v-if="item.Unit">（{{item.Unit}})</span> </span> 
 							</view>

pages/user/historySpend.vue

@@ -38,7 +38,7 @@
 				<view class="stateBox"  v-if="item.SheetType == 2">
 					<!-- 0待施工（已保存）1施工中（已派工）2已审核 3已质检 4 已作废 -->
 					<view class="danState"  :class="{danState3:item.PayState == 2}" v-if="item.SheetState < 2 ">未审核</view>
-					<view class="danState"  :class="{danState3:item.PayState == 2}" v-if="item.SheetState == 2">已审核</view>
+					<view class="danState"  :class="{danState2:item.PayState == 2}" v-if="item.SheetState == 2">已审核</view>
 					<view class="danState"  v-if="item.SheetState == 4">已作废</view>
 					<!-- 结算状态 -->
 					<view v-if="item.SheetState == 4">

utils/common.js

@@ -30,10 +30,14 @@ const automaticlogin = function() {
 			  provider: 'weixin',
 			  success: function (loginRes) {
 			    //console.log(loginRes);
+				uni.showLoading({
+					title: '加载中'
+				});
 				request.http('miniApp2/sys/getWxOpenID', {
 				   code:loginRes.code,
 				   unionId:extConfig.unionId
 				  },'GET').then(res => {
+					  uni.hideLoading();
 					  $store.commit('mutationswxOpenData', res.data);
 					  var themeColor= res.data.themeColor
 					   uni.setStorageSync('themeColor',themeColor);