Merge branch 'ats' into ats2

# Conflicts:
#	utils/request.js

pages.json

@@ -574,6 +574,15 @@
 							"enablePullDownRefresh": true
 						}
 					
+					},
+					{
+						"path": "luckList",
+						"style": {
+							/* "navigationBarTitleText": "中奖记录", */
+							"navigationStyle": "custom",
+							"enablePullDownRefresh": false
+						}
+					
 					}
 				]
 				

pages/index/aboutUS.vue

@@ -21,10 +21,13 @@
 				detail:'',
 			    unionID:'',
 				memberTitle:'',
+				scene:'',
 			}
 		},
 		onLoad(opt) {
 			this.unionID=opt.unionID
+			//this.scene='9B81E74B30734601BAFB5C3CD1C71584'
+			
 			this.memberTitle=opt.memberTitle
 			if(this.memberTitle){
 				this.getAboutMember();
@@ -32,7 +35,20 @@
 					title: this.memberTitle,
 				});
 			}else{
-				this.getExplain();
+				if(opt.scene&&opt.scene!='undefined'){
+					this.scene=opt.scene;
+					this.getShareParams()
+				}else{
+				    this.getExplain();
+				}
+				
+				/* if(opt.scene&&opt.scene!='undefined'){
+					this.scene=opt.scene;
+					this.getShareParams()
+				}else{
+					this.getExplain();
+				} */
+				
 			}
 			
 		},
@@ -40,6 +56,16 @@
 			
 		},
 		methods: {
+			getShareParams(){
+				this.$http('openMall/getShareParamsCache', {
+				  scene:this.scene,
+				 },'GET').then(res => {
+					var data= JSON.parse(res.data) ;
+					console.log(data)
+					this.unionID=data.unionID;
+					this.getExplain();
+				 })
+			},
 			getAboutMember(){
 				uni.showLoading({
 					title: '加载中'
@@ -62,6 +88,7 @@
 				    unionID:this.unionID
 				}, 'GET').then(res => {
 					uni.hideLoading();
+					console.log(res.data)
 					this.detail = res.data;
 					this.detail = this.detail.replace(/\<img/gi, '<img style="max-width:100%;height:auto" ');
 					//console.log('list+=', this.queryShopList);

pages/index/index.vue

@@ -367,6 +367,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(this.userInfo){
 				if(indexaddcar==1){
@@ -484,16 +488,16 @@
 				})
 			},
 			changeCar(){
-			    /* uni.scanCode({
+			   /* uni.scanCode({
 				 	success: function (res) {
 				 		console.log('条码类型：' + res.scanType);
 						console.log( res);
 				 	}
 				 });
 				 return false; */
-				uni.navigateTo({
+				 uni.navigateTo({
 					url:'../user/addCar/cailist'
-				})
+				}) 
 			},
 			goMUsers(){
 				if(!this.userInfo){

pages/index/shopList.vue

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

pages/subPack/luckList.vue

@@ -0,0 +1,189 @@
+<template>
+	<view class="content">
+		<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"
+			 v-for="item in list">
+			  <view class=" newluckLineActName">{{item.ActName}}</view>
+			  <view class="luckDrawBpttom">
+			    <view class="luckDrawBtime">抽奖时间: {{item.DrawTime}}</view>
+			    <view class="luckDrawBdengji">{{item.PrizeName}}/{{item.PrizeValue}}</view>
+			  </view>
+			  <view class="luckDrawBtimedj" v-if="item.TakeTime">
+			    兑奖时间: {{item.TakeTime}}
+			  </view>
+			
+			</view>
+		</view>
+         <nodata v-show="list.length==0&&loading"></nodata>
+		
+		
+
+	</view>
+</template>
+
+<script>
+	import nodata from '@/components/nodata/nodata.vue'
+	import homenav from "@/components/homenav/nav.vue"
+	export default {
+		components: {
+			nodata,homenav
+		},
+		data() {
+			return {
+				list:[],
+				chooseTab: 0,
+				page: 1,
+				limit: 9,
+				loading:false,
+				iStatusBarHeight:'',
+			}
+		},
+		onLoad(opt) {
+			this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
+			this.getList(0);
+		},
+		onShow() {
+			
+		},
+		methods: {
+			
+			getList(num) {
+				this.chooseTab=num;
+				uni.showLoading({
+					title: '加载中'
+				});
+				this.loading=false
+				this.$http('open/miniapp/marketingLuckDraw/listLuckyDrawCustomerDetailPage', {
+					page: this.page,
+					limit: this.limit,
+					prizeState: 1,
+					takeState: num
+				}, 'POST').then(res => {
+					uni.hideLoading();
+					this.loading = true;
+				
+					var list = res.data.records;
+				
+					if (this.page == 1) {
+						this.list = list
+					} else {
+						this.list = this.items.concat(list)
+					}
+				
+				})
+			},
+			
+			
+
+		},
+
+
+	
+
+	}
+</script>
+
+<style scoped>
+	.content{
+		min-height: 100vh;
+		background: rgb(247, 247, 247);
+	}
+	.coupon-item{
+	  position: relative;
+	  margin: 24rpx 0;
+	  background:rgba(255,255,255,1);
+	  border-radius:10rpx;
+	
+	  display: flex;
+	  }
+	.tabToptyh{
+		display: flex;
+		justify-content: space-around;
+		height: 93rpx;
+		background: #ffffff;
+		border-bottom: 1px solid #EEEEEE;
+	}
+	.tabToplieyh{
+		line-height: 90rpx;
+		color: #3C3C3C;
+		font-size: 30rpx;
+		font-weight: 400;
+	}
+	.newluckLineActName{
+		text-overflow: -o-ellipsis-lastline;
+		overflow: hidden;				
+		text-overflow: ellipsis;		
+		display: -webkit-box;			
+		-webkit-line-clamp: 2;			
+		line-clamp: 2;					
+		-webkit-box-orient: vertical;
+		font-size: 28rpx !important;
+		font-weight: 500 !important;
+	}
+	.luckDrawBpttom{
+		display: flex;
+		justify-content: space-between;
+	}
+	.luckDrawBtime{
+		color: #666666;
+		font-size: 24rpx;
+	}
+	.luckDrawBdengji{
+		color: #FF7D30;
+		font-size: 24rpx;
+	}
+	.luckDrawBtimedj{
+		color: #666666;
+		font-size: 24rpx;
+		padding-top: 16rpx;
+	}
+	.luckDrawBpttom{
+		padding-top: 22rpx;
+	}
+	.newluckLinebox{
+		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/addCar/cailist.vue

@@ -13,8 +13,16 @@
 						<!-- 	<span>{{item.brand?item.brand:''}} {{item.series?item.series:''}}</span> -->
 						    <span>{{item.plateNumber}}</span>
 							<view class="plateNumber" v-if="item.milage">{{item.milage}}km</view>
+							<view class="nextCare" v-if="item.nextReturnDate||item.nextCareMilage">
+								<image class="carByIcon" src="../../../static/timg/car2.png" mode=""></image>
+							   <span class="nextCareTitle">下次保养</span>
+							   <span class="nextCaretxt" v-if="item.nextReturnDate">{{item.nextReturnDate}}天后</span>
+							   <span class="nextCaretxt" v-if="item.nextReturnDate&&item.nextCareMilage">或</span>
+							   <span class="nextCaretxt" v-if="item.nextCareMilage">{{item.nextCareMilage}}km</span>
+							</view>
 						</view>
-						<view class="carMS">{{item.carModel?item.carModel:''}}</view>
+						<!-- <view class="carMS">{{item.carModel?item.carModel:''}}</view> -->
+						<view class="carMS">{{item.brand?item.brand:''}} {{item.series?item.series:''}}</view>
 					</view>
 				</view>
 				<view class="lineBottom">
@@ -136,6 +144,18 @@
 </script>
 
 <style scoped>
+	.carByIcon{
+		width: 34rpx;height: 34rpx;
+	}
+	.nextCaretxt{
+		color: #FF0000;
+	}
+	.nextCare{
+		font-size: 20rpx;
+		line-height: 36rpx;
+		display: flex;
+		padding-left: 6rpx;
+	}
 	.box {
 		min-height: 100vh;
 		background: #F4F5F7;

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,9 +166,16 @@
 						  	{{item.AmountMoney?item.AmountMoney:0}}
 						  </view>
 					  </view>
-						
+						<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="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> -->
 								
@@ -189,14 +196,19 @@
 
 						<view class="goodTop">
 							<view class="detailedName"><span v-if="item.CardDetailID"
-									class="kaColor">卡</span>{{item.Brand}} {{item.GoodsName}}</view>
-							<view class="qty">x{{item.SaleQty}}</view>
+									class="kaColor">卡</span> 
+									<span v-if="brandSetting">{{item.Brand}}</span>
+									 {{item.GoodsName}}
+									 <span v-if="specSetting">{{item.Spec}}</span>
+									 <span v-if="factoryNumber">{{item.FactoryCode}}</span>
+							</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> -->
-								<view class="price" v-if="ItemMoney">
+								<view class="price" v-if="goodsPrice">
 									<span>￥</span>
 									{{item.AmountMoney?item.AmountMoney:0}}
 								</view>
@@ -218,15 +230,15 @@
 				</view>
 				<view class="goodscostLine" v-if="TotalDiscountMoney">
 					<view class="goodscostTxt">优惠总计</view>
-					<view class="goodsCostNum">￥{{orderData.billsheet.TotalDiscountMoney?orderData.billsheet.TotalDiscountMoney:0}}</view>
+					<view class="goodsCostNum3">￥{{orderData.billsheet.TotalDiscountMoney?orderData.billsheet.TotalDiscountMoney:0}}</view>
 				</view>
 				<view class="goodscostLine" v-if="CardMoneyT">
 					<view class="goodscostTxt">计次卡冲销</view>
-					<view class="goodsCostNum">￥{{orderData.billsheet.CardMoneyT?orderData.billsheet.CardMoneyT:0}}</view>
+					<view class="goodsCostNum3">￥{{orderData.billsheet.CardMoneyT?orderData.billsheet.CardMoneyT:0}}</view>
 				</view>
 				<view class="goodscostLine" v-if="CardMoneyC">
 					<view class="goodscostTxt">储值卡冲销</view>
-					<view class="goodsCostNum">￥{{orderData.billsheet.CardMoneyCWriteOff?orderData.billsheet.CardMoneyCWriteOff:0}}</view>
+					<view class="goodsCostNum3">￥{{orderData.billsheet.CardMoneyCWriteOff?orderData.billsheet.CardMoneyCWriteOff:0}}</view>
 				</view>
 				<view class="goodscostLine" v-if="ReceiptsMoney">
 					<view class="goodscostTxt">支付金额</view>
@@ -297,7 +309,15 @@
 				CardMoneyT: false, //计次卡冲销
 				CardMoneyC: false, //储值卡冲销
 				ReceiptsMoney: false, //支付金额
+				brandSetting:false,
+				specSetting:false,
+				factoryNumber:false,
+				goodsNumber:false,
+				goodsPrice:false,
+				itemWorkHours:false,
+				itemPrice:false,
 				iStatusBarHeight:'',
+				ShowSetting:'',
 			}
 		},
 		onLoad(opt) {
@@ -308,20 +328,23 @@
 			this.ext = this.$common.getExtStoreId();
 			if (this.userInfo) {
 				this.getData()
+				this.myPower();
+				this.showPower();
 			} else {
 				this.$common.automaticlogin().then(val => {
 					this.userInfo = this.$store.state.userInfo;
 					this.wxOpenData = this.$store.state.wxOpenData;
 					this.themeColor = uni.getStorageSync("themeColor");
 					this.getData()
+					this.myPower();
+					this.showPower();
 					if(!this.userInfo){
 						this.authorizShow=true
 					}
 				})
 			}
 
-			this.myPower();
-			this.showPower();
+			
 		},
 
 		methods: {
@@ -346,7 +369,7 @@
 					// CardMoneyC:false,//储值卡冲销
 					// ReceiptsMoney:false,//支付金额
 
-
+                    this.ShowSetting=res.data
 					var list = res.data
 					list.forEach((item, index) => {
 						if (item.fieldValue == 'FaultDescription') {
@@ -382,7 +405,29 @@
 						if (item.fieldValue == 'TotalDiscountMoney') {
 							this.TotalDiscountMoney = item.isChecked
 						}
-
+						if (item.fieldValue == 'brand') {
+							this.brandSetting = item.isChecked
+						}
+						if (item.fieldValue == 'spec') {
+							this.specSetting = item.isChecked
+						}
+						if (item.fieldValue == 'factoryNumber') {
+							this.factoryNumber = item.isChecked
+						}
+						if (item.fieldValue == 'goodsNumber') {
+							this.goodsNumber = item.isChecked
+						}
+						if (item.fieldValue == 'goodsPrice') {
+							this.goodsPrice = item.isChecked
+						}
+						if (item.fieldValue == 'itemWorkHours') {
+							this.itemWorkHours = item.isChecked
+						}
+						if (item.fieldValue == 'itemPrice') {
+							this.itemPrice = item.isChecked
+						}
+						
+                        
 
 
 					})
@@ -555,6 +600,8 @@
 		onPullDownRefresh() {
 
 			this.getData()
+			this.myPower();
+			this.showPower();
 			setTimeout(function() {
 				uni.stopPullDownRefresh();
 			}, 1000);
@@ -564,6 +611,23 @@
 </script>
 
 <style scoped>
+	.itemWorkHoursBox{
+		display: flex;
+		font-size: 24rpx;
+		font-weight: 400;
+		color: #999999;
+		padding-top: 20rpx;padding-bottom: 20rpx;
+	}
+	.nopb{
+		padding-bottom: 0px;
+	}
+	.itemWorkHours{
+		
+		padding-right: 50rpx;
+	}
+	.itemPrice{
+		
+	}
 	.newboxTop{
 		display: flex;
 		padding-left: 20rpx;
@@ -843,7 +907,7 @@
 
 	.secondBox {
 		display: flex;
-		padding: 20rpx 0rpx;
+		/* padding: 20rpx 0rpx; */
 		justify-content: space-between;
 		align-items: baseline;
 		border-bottom: 1rpx solid #EEEEEE;
@@ -851,6 +915,7 @@
 
 	.noLine {
 		border-bottom: 0 solid #FFFFFF;
+		
 	}
 
 	.comment {
@@ -859,6 +924,7 @@
 		font-weight: 400;
 		color: #999999;
 		flex-grow: 1;
+		 padding: 20rpx 0rpx;
 	}
 
 	.secondRight {
@@ -878,7 +944,7 @@
 
 		font-size: 32rpx;
 		font-weight: 500;
-		color: #FF0000;
+		/* color: #FF0000; */
 		display: flex;
 
 		align-items: center;
@@ -918,6 +984,9 @@
     .goodsCostNumJsfs{
 		color: #333333;
 	}
+	.goodsCostNum3{
+		font-weight: bold;
+	}
 	.information {
 		width: 702rpx;
 		background: #FFFFFF;

pages/user/historySpend.vue

@@ -167,7 +167,10 @@
 			this.userInfo=this.$store.state.userInfo;
 			this.ext=this.$common.getExtStoreId();
 			if(this.userInfo){
-				
+				this.myOrderCoupon()
+				this.myPower()
+				this.showPower()
+				this.getplateNumber()
 			}else{
 				this.$common.automaticlogin().then(val => {
 					this.userInfo=this.$store.state.userInfo;

pages/user/user.vue

@@ -256,6 +256,13 @@
 				</view>
 				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
 			</view> 
+			<!-- <view class="rowBox" @click="gonavigateTo('../subPack/luckList')">
+				<view class="leftView">
+					<image src="../../static/timg/icon_jydd.png" mode="" class="liftIcon"></image>
+					<view class="rowTitle">中奖记录</view>
+				</view>
+				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
+			</view> -->
 			
 		</view>
 		<view class="rowBoxBg">

utils/request.js

@@ -9,7 +9,7 @@ import $store from '../store'
 const extConfig = uni.getExtConfigSync();		
 console.log(extConfig)
 //const baseUrl=extConfig.url+'/'
-const baseUrl='http://192.168.0.176:20187/'
+const baseUrl='http://192.168.0.171:20187/'
 //const baseUrl='https://store-api.qdbtl.cn/'
 //const baseUrl='http://dms.66km.com.cn/'
 //wxc023ff04deb28f2d正式  wx33053a645546ec31 E37BB296-5A08-4534-859D-B351BA611AF9 EEADACCD-8A19-499D-8AD7-6975D2C93243