Merge branch 'dev' into ats

pages.json

@@ -578,7 +578,8 @@
 					{
 						"path": "luckList",
 						"style": {
-							"navigationBarTitleText": "中奖记录",
+							/* "navigationBarTitleText": "中奖记录", */
+							"navigationStyle": "custom",
 							"enablePullDownRefresh": false
 						}
 					

pages/index/index.vue

@@ -363,6 +363,10 @@
 			this.userInfo=this.$store.state.userInfo;
 			this.wxOpenData=this.$store.state.wxOpenData;
 			var indexaddcar = uni.getStorageSync("indexaddcar");
+			var themeColor = uni.getStorageSync("themeColor");
+			if(themeColor){
+				this.themeColor=themeColor
+			}
 			this.getwxLoing=true;
 			if(indexaddcar==1){
 				uni.removeStorageSync('indexaddcar');

pages/index/shopList.vue

@@ -222,6 +222,7 @@
 						});
 					},
 					fail: (err) => {
+						console.log(err)
 						 that.getqueryShopList();
 						 
 					}})

pages/subPack/luckList.vue

@@ -1,8 +1,14 @@
 <template>
 	<view class="content">
-		<view class="tabToptyh">
+		<homenav :iStatusBarHeight="iStatusBarHeight" :title="'救援订单'" :cj="4"></homenav>
+		<!-- <view class="tabToptyh">
 		  <view class="tabToplieyh" @click="getList(0)"  :class="{'tablineActyh':chooseTab==0}">未兑奖</view>
 		  <view class="tabToplieyh" @click="getList(1)" :class="{'tablineActyh':chooseTab==1}">已兑奖</view>
+		</view> -->
+		<view class="tab">
+			<view class="tabLine" :class="{tabActive:chooseTab==0}" @click="getList(0)">未兑奖</view>
+			<view class="tabLine" :class="{tabActive:chooseTab==1}" @click="getList(1)">已兑奖</view>
+			
 		</view>
 		<view class="newluckLinebox">
 			<view class="coupon-item newluckLine" style="flex-direction: column;padding: 15px 10px;box-sizing: border-box;height: auto"
@@ -27,9 +33,10 @@
 
 <script>
 	import nodata from '@/components/nodata/nodata.vue'
+	import homenav from "@/components/homenav/nav.vue"
 	export default {
 		components: {
-			nodata
+			nodata,homenav
 		},
 		data() {
 			return {
@@ -38,9 +45,11 @@
 				page: 1,
 				limit: 9,
 				loading:false,
+				iStatusBarHeight:'',
 			}
 		},
 		onLoad(opt) {
+			this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
 			this.getList(0);
 		},
 		onShow() {
@@ -79,13 +88,7 @@
 		},
 
 
-		onPullDownRefresh() {
-
-			this.getData()
-			setTimeout(function() {
-				uni.stopPullDownRefresh();
-			}, 1000);
-		},
+	
 
 	}
 </script>
@@ -151,9 +154,36 @@
 		flex: 1;
 		overflow-y: auto;
 		padding: 12rpx 24rpx;
+		padding-top: 92rpx;
 	}
 	.tablineActyh{
 		color: #FF7D30;
 		border-bottom: 5rpx solid #FF7D30;
 	}
+	.tab {
+		background: #FFFFFF;
+		display: flex;
+		justify-content: space-around;
+		line-height: 92rpx;
+		position: fixed;
+		width: calc(100vw - 100rpx);
+		padding-left: 50rpx;
+		padding-right: 50rpx;
+		height: 92rpx;
+		z-index: 11;
+	}
+	
+	.tabLine {
+	
+		font-size: 28rpx;
+		color: #333333;
+		text-align: center;
+	}
+	
+	.tabActive {
+		color: #FF0000;
+		font-weight: bold;
+		border-bottom: 4rpx solid #FF0000;
+	
+	}
 </style>

pages/user/historyDetail.vue

@@ -154,7 +154,7 @@
 			</view>
 
 			<!-- 项目明细 -->
-			<view class="detailedBox itemBox" v-if=" orderData.listItems.length!=0">
+			<view class="detailedBox itemBox" v-if=" orderData.listItems.length!=0" style="padding-bottom: 0;">
 				<view class="detailedTitle">项目</view>
 				<view class="detailedLineBox">
 					<view class="detailedLine" v-for="(item,index) in orderData.listItems">
@@ -166,16 +166,16 @@
 						  	{{item.AmountMoney?item.AmountMoney:0}}
 						  </view>
 					  </view>
-						<view class="itemWorkHoursBox">
+						<view class="itemWorkHoursBox" v-if="itemWorkHours&&itemWorkHours" :class="{nopb:ItemComment&&item.Comment}">
 							<view class="itemWorkHours" v-if="itemWorkHours">
 								工时：{{item.SaleQty}}
 							</view>
-							<view class="itemPrice" v-if="itemPrice">
+							<view class="itemPrice" v-if="itemWorkHours">
 								单价：{{item.SalePrice}}
 							</view>
 						</view>
 						<view class="secondBox" v-if="ItemComment" :class="{noLine:index == orderData.listItems.length-1}">
-							<view class="comment" >{{item.Comment}}</view>
+							<view class="comment" v-if="item.Comment">{{item.Comment}}</view>
 							<view class="secondRight">
 								<!-- <view class="grayPrice">￥{{item.CheckOutTaxRate}}</view> -->
 								
@@ -204,7 +204,7 @@
 							</view>
 							<view class="qty" v-if="goodsNumber">x{{item.SaleQty}}</view>
 						</view>
-						<view class="secondBox" :class="{noLine:index == orderData.listParts.length-1}">
+						<view class="secondBox"  v-if="GoodsComment" :class="{noLine:index == orderData.listParts.length-1}">
 							<view class="comment" v-if="GoodsComment">{{item.Comment}}</view>
 							<view class="secondRight">
 								<!-- <view class="grayPrice">￥{{item.CheckOutTaxRate}}</view> -->
@@ -600,6 +600,8 @@
 		onPullDownRefresh() {
 
 			this.getData()
+			this.myPower();
+			this.showPower();
 			setTimeout(function() {
 				uni.stopPullDownRefresh();
 			}, 1000);
@@ -614,13 +616,17 @@
 		font-size: 24rpx;
 		font-weight: 400;
 		color: #999999;
+		padding-top: 20rpx;padding-bottom: 20rpx;
+	}
+	.nopb{
+		padding-bottom: 0px;
 	}
 	.itemWorkHours{
-		padding-top: 15rpx;padding-bottom: 15rpx;
+		
 		padding-right: 50rpx;
 	}
 	.itemPrice{
-		padding-top: 15rpx;padding-bottom: 15rpx;
+		
 	}
 	.newboxTop{
 		display: flex;
@@ -901,7 +907,7 @@
 
 	.secondBox {
 		display: flex;
-		padding: 20rpx 0rpx;
+		/* padding: 20rpx 0rpx; */
 		justify-content: space-between;
 		align-items: baseline;
 		border-bottom: 1rpx solid #EEEEEE;
@@ -909,6 +915,7 @@
 
 	.noLine {
 		border-bottom: 0 solid #FFFFFF;
+		
 	}
 
 	.comment {
@@ -917,6 +924,7 @@
 		font-weight: 400;
 		color: #999999;
 		flex-grow: 1;
+		 padding: 20rpx 0rpx;
 	}
 
 	.secondRight {