代码提交

pages.json

@@ -566,6 +566,15 @@
 							"enablePullDownRefresh": false
 						}
 
+					},
+					{
+						"path": "oldhistoryDetail",
+						"style": {
+							//"navigationBarTitleText": "消费明细",
+							"navigationStyle": "custom",
+							"enablePullDownRefresh": true
+						}
+					
 					}
 				]
 				
@@ -573,31 +582,31 @@
 	
 		"tabBar": {
 			"color": "#8a8a8a",
-			"selectedColor": "#D53533",
+			"selectedColor": "#1677FF",
 			"borderStyle": "black",
 			"backgroundColor": "#ffffff",
 			"list": [{
 					"pagePath": "pages/index/index",
 					"iconPath": "./static/tabimg/index2.png",
-					"selectedIconPath": "./static/tabimg/index1.png",
+					"selectedIconPath": "./static/tabimg/index1677FF.png",
 					"text": "首页"
 				},
 				{
 					"pagePath": "pages/shop/shop",
 					"iconPath": "./static/tabimg/shop2.png",
-					"selectedIconPath": "./static/tabimg/shop1.png",
+					"selectedIconPath": "./static/tabimg/shop1677FF.png",
 					"text": "商城"
 				},
 				{
 					"pagePath": "pages/activity/activity",
 					"iconPath": "./static/tabimg/activty2.png",
-					"selectedIconPath": "./static/tabimg/activity1.png",
+					"selectedIconPath": "./static/tabimg/activty1677FF.png",
 					"text": "活动"
 				},
 				{
 					"pagePath": "pages/user/user",
 					"iconPath": "./static/tabimg/me2.png",
-					"selectedIconPath": "./static/tabimg/me1.png",
+					"selectedIconPath": "./static/tabimg/me1677FF.png",
 					"text": "我的"
 				}
 

pages/index/index.vue

@@ -282,7 +282,7 @@
 				InsuranceExpireDate:'',
 				NextCareDate:'',
 				NextAuditDate:'',
-				themeColor:'',
+				themeColor:'1677FF',
 				getwxLoing:false,
 				shareID:'',
 				discount:'',
@@ -339,6 +339,7 @@
 			
 		},
 		onShow() {
+			
 			this.userInfo=this.$store.state.userInfo;
 			this.wxOpenData=this.$store.state.wxOpenData;
 			var indexaddcar = uni.getStorageSync("indexaddcar");
@@ -348,6 +349,11 @@
 				this.getCarList();
 			}else{
 				this.carInfo=this.$store.state.carInfo;
+				console.log("车辆信息")
+				console.log(this.carInfo)
+				if(!this.carInfo){
+					this.getCarList();
+				}
 				this.jsTime()
 			}
 		    
@@ -902,6 +908,8 @@
 				  },'GET').then(res => {
 					 if(res.code==401){
 						// this.uniLogin()
+						this.carInfo=''
+						this.$store.commit('mutationscarInfo', '')
 					 }else{
 						 this.carInfo=res.data[0]
 						 //this.carInfo=[]

pages/index/onlineBooking.vue

@@ -952,7 +952,8 @@
 	.authorizContbutton{
 		width: 422rpx;
 		height: 88rpx;
-		background: #D53533;
+		/* background: #D53533; */
+		background: #1677FF;
 		border-radius: 44rpx;
 		line-height: 88rpx;
 		text-align: center;

pages/user/historySpend.vue

@@ -63,11 +63,17 @@
 
 			<view class="shopName">{{item.ShopName}}</view>
 			
-			<view class="itemN" v-if="item.listItems.length != 0">
+			<!-- <view class="itemN" v-if="item.listItems.length != 0">
 				<view class="itemContent" v-if="item.listItems.length != 0" v-for="(v,i) in item.listItems">{{v.ItemName}},</view>
 			</view>
 			<view class="itemN" v-if="item.listParts.length != 0">
 				<view class="itemContent" v-if="item.listParts.length != 0" v-for="(v,i) in item.listParts">{{v.GoodsName}},</view>
+			</view> -->
+			<view class="itemN" v-if="item.ItemName">
+				<view class="itemContent" >{{item.ItemName}}</view>
+			</view>
+			<view class="itemN" v-if="item.GoodsName">
+				<view class="itemContent" >{{item.GoodsName}}</view>
 			</view>
 			
 			<view v-if="((item.PayState == 2) && (appraise == true) && ((item.lastDay <= 30 && item.EvaluateState == 0) || item.EvaluateState == 1))" class="bottom">
@@ -75,11 +81,72 @@
 				<view v-if="item.EvaluateState == 1" @click.stop="goAppraiseDetail(item)" class="kan">查看评价</view>
 			</view>
 		</view>
+		<view class="itemHistory" v-for="(item,index) in oldlist" :key="index" @click="goDetail(item)">
+			<view class="topBox">
+				<view class="dan">{{item.code}}</view>
+				
+				<!-- SheetType单据类型(1维修单 2销售单3洗车单4销售退货) -->
+				<view class="stateBox" v-if="item.SheetType == 1">
+					<!-- 0待施工（已保存）1施工中（已派工）2已完工 3已质检 4 已作废 -->
+					<view class="danState"  :class="{danState2:item.PayState == 2}" v-if="item.SheetState == 0">待施工</view>
+					<view class="danState"  :class="{danState2:item.PayState == 2}" v-if="item.SheetState == 1">施工中</view>
+					<view class="danState"  :class="{danState2:item.PayState == 2}" v-if="item.SheetState == 2">已完工</view>
+					<view class="danState"  :class="{danState2:item.PayState == 2}" v-if="item.SheetState == 3">已质检</view>
+					<view class="danState"  :class="{danState2:item.PayState == 2}" v-if="item.SheetState == 4">已作废</view>
+					<!-- 结算状态 -->
+					<view class="danState" v-if="item.PayState == 0">/未结算</view>
+					<view class="danState2" v-if="item.PayState == 2">/已结算</view>
+					
+				</view>
+				<view class="stateBox"  v-if="item.SheetType == 2">
+					<!-- 0待施工（已保存）1施工中（已派工）2已审核 3已质检 4 已作废 -->
+					<view class="danState"  :class="{danState2: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"  :class="{danState2:item.PayState == 2}" v-if="item.SheetState == 4">已作废</view>
+					<!-- 结算状态 -->
+					<view class="danState" v-if="item.PayState == 0">/未结算</view>
+					<view class="danState2" v-if="item.PayState == 2">/已结算</view>
+					
+					
+				</view>
+				<view class="stateBox"  v-if="item.SheetType == 3">
+					<!-- 0待施工（已保存）1施工中（已派工）2已完工 3已质检 4 已作废 -->
+					<view class="danState" :class="{danState2:item.PayState == 2}" v-if="item.SheetState == 0">已保存</view>
+					<view class="danState" :class="{danState2:item.PayState == 2}" v-if="item.SheetState == 4">已作废</view>
+					<!-- 结算状态 -->
+					<view class="danState" v-if="item.PayState == 0">/未结算</view>
+					<view class="danState2" v-if="item.PayState == 2">/已结算</view>
+				</view>
+				
+			</view>
+			
+			
+			<view class="carPlate">
+				<view class="plateBox">
+					<view class="plate">{{item.PlateNumber}}</view>
+					
+					<view class="mileage" v-if="item.CurrentMileage>0">{{item.CurrentMileage}}km</view>
+				</view>
+				<view v-if="ReceiptsMoney" class="price"><span style="font-size: 22rpx;">￥</span>{{item.money?item.money:0}}</view>
+			</view>
+			<view class="time">{{item.time}}</view>
+		
+			<view class="shopName">{{item.ShopName}}</view>
+			<view class="itemN" v-if="item.ItemName">
+				<view class="itemContent" >{{item.ItemName}}</view>
+			</view>
+			<view class="itemN" v-if="item.GoodsName">
+				<view class="itemContent" >{{item.GoodsName}}</view>
+			</view>
+			
+			
+		</view>
+		
 
 		<!-- 上拉 加载更多 -->
 		<view class="noMore" v-if="noMoreShow && (itemData.length!=0)">没有更多数据</view>
 		<!-- 无数据空白页 -->
-		<nodata v-if="itemData.length==0"></nodata>
+		<nodata v-if="itemData.length==0&&oldlist.length==0"></nodata>
 
 	</view>
 </template>
@@ -96,6 +163,7 @@
 			return {
 				page: 1,
 				itemData: [],
+				oldlist:[],
 				noMoreShow: false,
 				appraise:false,
 				ReceiptsMoney:false,//支付金额
@@ -174,16 +242,20 @@
 				})
 			},
 			goDetail(item) {
-				uni.navigateTo({
+				/* uni.navigateTo({
 					url: 'historyDetail?id=' + item.id + '&lastDay=' + item.lastDay
+				}) */
+				uni.navigateTo({
+					url: '../subPack/oldhistoryDetail?id=' + item.id + '&lastDay=' + item.lastDay
 				})
+				
 			},
 			myOrderCoupon() {
 				let that = this
 				uni.showLoading({
 					title: '加载中'
 				})
-				this.$http('openweiXinCardInfoController/queryConsumptionList', {
+				/* this.$http('openweiXinCardInfoController/queryConsumptionList', {
                      plateNumber:this.plateNumber
 					// page: this.page,
 					// limit: 10,
@@ -210,6 +282,21 @@
 					
 
 
+				}) */
+				this.$http('openweiXinCardInfoController/queryConsumptionListV2', {
+				     plateNumber:this.plateNumber
+					// page: this.page,
+					// limit: 10,
+				}, 'POST').then(res => {
+					uni.hideLoading();
+					var list = res.data.list
+					this.oldlist=res.data.oldlist
+					this.itemData = list
+					if (list.length < 10) {
+						this.noMoreShow = true
+					} else {
+						this.noMoreShow = false
+					}
 				})
 			},
 			//时间对比

pages/user/user.vue

@@ -406,7 +406,7 @@
 				nickName: '',
 				phone: '',
 				ext: '',
-				themeColor: '',
+				themeColor: '1677FF',
 				release_version: '',
 				qrimg:'',
 				qrSHow:false,
@@ -485,6 +485,7 @@
 				    if (res.confirm) {
 						uni.clearStorageSync()
 						that.$store.commit('mutationsuserInfo', '')
+						that.$store.commit('mutationscarInfo', '')
 						that.$http('miniApp2/sys/logout', {
 							
 						}, 'GET').then(res => {

utils/common.js

@@ -73,7 +73,7 @@ function noMultipleClicks(methods, info) {
 function getExtStoreId(type){
 	try{
 	 var extConfig = uni.getExtConfigSync ? uni.getExtConfigSync() : {shopId:'默认的门店id'};
-		 /* extConfig={
+		/*  extConfig={
 		  	"shopId": "23173848-292E-4AEA-B590-73AC9A763F1D",
 		  	"url":"https://store-api.qdbtl.cn/",
 		  	"unionId":"C3748B46-B778-40AA-8C60-A9B0F2FA23A7",