Merge branch 'master' of http://47.98.226.240:3000/twt/wxThird

* 'master' of http://47.98.226.240:3000/twt/wxThird:
  111
  首页皮肤

pages/activity/jkDetail.vue

@@ -95,7 +95,7 @@
 					<view class="shareTxt">分享</view>
 				</button> -->
 				<!-- 状态1未开始 2进行中3已结束 -->
-				<view class="bottomBtn" v-if="info.state==2" @click="signUp">
+				<view class="bottomBtn" v-if="info.state==2" @click="signUp" :style="{background:'#'+themeColor}">
 				  <span v-if="info.money">￥{{info.money}} &nbsp; 立即抢购</span>
 				  <span v-else>立即报名</span>
 				</view>
@@ -132,7 +132,7 @@
 				</view>
 				<view class="bmTtnBox">
 					<view style="height: 1rpx;"></view>
-					<view class="bmBtn" @click="submitOrder">
+					<view class="bmBtn" @click="submitOrder" :style="{background:'#'+themeColor}">
 						<span v-if="info.money">￥{{info.money}} &nbsp; 立即抢购</span>
 						<span v-else>立即报名</span>
 					</view>
@@ -268,6 +268,7 @@
 				 ext:'',
 				 shareId:'',
 				 scene:'',
+				 themeColor:'',
 			}
 		},
 		onLoad(opt) {
@@ -278,6 +279,7 @@
 		   this.userInfo=this.$store.state.userInfo;
 		  // opt.scene='10002'
 		   if(this.userInfo){
+			   this.themeColor = uni.getStorageSync("themeColor");
 			this.queryGoodsLook()
 			if(opt.scene&&opt.scene!='undefined'){
 				this.scene=opt.scene;
@@ -291,6 +293,7 @@
 		   	
 		   }else{
 		   	this.$common.automaticlogin().then(val => {
+				this.themeColor = uni.getStorageSync("themeColor");
 		   		this.userInfo=this.$store.state.userInfo;
 		   		
 		   		if(opt.scene&&opt.scene!='undefined'){
@@ -414,6 +417,7 @@
 				this.useShopShow=true;
 			},
 			submitOrder(){
+				uni.hideKeyboard()
 				var jsonArray={
 					itemId:this.collectingID,
 					itemName:this.info.activityName,

pages/index/index.vue

@@ -1,13 +1,13 @@
 <template>
 	<view class="content">
-		<view class="indexTop">
+		<view class="indexTop" :style="{background:'#'+themeColor}" v-if="getwxLoing">
 			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
 			<view class="indexnav">{{wxOpenData.unionName}}</view>
 		</view>
 		<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
 		<view style="height: 43px;"></view>
-		<view class="topBox"></view>
-		<view class="yuanhu"></view>
+		<view class="topBox" :style="{background:'#'+themeColor}" v-if="getwxLoing"></view>
+		<view class="yuanhu" :style="{background:'#'+themeColor}" v-if="getwxLoing"></view>
 		<view class="shoptopbox2"  v-if="!carInfo">
 		  <view class="carinfoBox2">
 		    <view class="carinfoBoxNocar" @click="addCar">
@@ -93,7 +93,7 @@
 				<img v-if="managerInfo.avatar" :src="managerInfo.avatar" alt="" class="advisertx">
 				<img v-else src="../../static/timg/pic_def_ava@2x.png" alt="" class="advisertx">
 				<view class="adviserNema">{{managerInfo.name}}</view>
-				<view class="adviserms">服务顾问</view>
+				<view class="adviserms" :style="{border:'1px solid #'+themeColor,color:'#'+themeColor}">服务顾问</view>
 			</view>
 			<img src="../../static/timg/icon_arrow_right.png" alt="" class="adviserJt">
 		</view>
@@ -109,7 +109,7 @@
 		
 		<view class="advertisement" v-if="homeCardList.ad1.length>0">
 			<swiper class="swiper2" circular  :autoplay="true" :interval="interval"
-							:duration="duration" :indicator-dots="true" indicator-color="#CCCCCC" indicator-active-color="#D53533">
+							:duration="duration" :indicator-dots="true" indicator-color="#CCCCCC" :indicator-active-color="'#'+themeColor">
 				<swiper-item v-for="(item,index) in homeCardList.ad1">
 					<view class="swiper-item2" @click="goRoter(item)">
 						<image class="swiper-item2Img" :src="item.icon" mode=""></image>
@@ -119,7 +119,7 @@
 		</view>
 		<view class="advertisement" v-if="homeCardList.ad2.length>0">
 			<swiper class="swiper2" circular  :autoplay="true" :interval="interval"
-							:duration="duration" :indicator-dots="true" indicator-color="#CCCCCC" indicator-active-color="#D53533">
+							:duration="duration" :indicator-dots="true" indicator-color="#CCCCCC" :indicator-active-color="'#'+themeColor">
 				<swiper-item v-for="(item,index) in homeCardList.ad2">
 					<view class="swiper-item2" @click="goRoter(item)">
 						<image class="swiper-item2Img" :src="item.icon" mode=""></image>
@@ -129,7 +129,7 @@
 		</view>
 		<view class="advertisement" v-if="homeCardList.ad3.length>0">
 			<swiper class="swiper2" circular  :autoplay="true" :interval="interval"
-							:duration="duration" :indicator-dots="true" indicator-color="#CCCCCC" indicator-active-color="#D53533">
+							:duration="duration" :indicator-dots="true" indicator-color="#CCCCCC" :indicator-active-color="'#'+themeColor">
 				<swiper-item v-for="(item,index) in homeCardList.ad3">
 					<view class="swiper-item2" @click="goRoter(item)">
 						<image class="swiper-item2Img" :src="item.icon" mode=""></image>
@@ -141,7 +141,7 @@
 		<view class="Hot">
 			<view class="hotTop">
 				<view class="hotLeft">
-					<view class="hotSx"></view>
+					<view class="hotSx" :style="{background:'#'+themeColor}"></view>
 					<view class="hottitle">热门活动</view>
 				</view>
 				<view class="hotRight" @click="moreJk">
@@ -169,7 +169,7 @@
 			<view class="Hot" v-if="homeCardList.openMGoods.showType==1">
 				<view class="hotTop">
 					<view class="hotLeft">
-						<view class="hotSx"></view>
+						<view class="hotSx" :style="{background:'#'+themeColor}"></view>
 						<view class="hottitle">热门车型</view>
 					</view>
 					<view class="hotRight" @click="goShop">
@@ -246,6 +246,8 @@
 				InsuranceExpireDate:'',
 				NextCareDate:'',
 				NextAuditDate:'',
+				themeColor:'',
+				getwxLoing:false,
 			}
 		},
 		onLoad() {
@@ -507,6 +509,9 @@
 				   unionId:this.unionId
 				  },'GET').then(res => {
 				 	this.wxOpenData=res.data;
+					this.themeColor=res.data.themeColor
+					//this.themeColor='FFFFFF'
+					this.getwxLoing=true;
 					uni.setNavigationBarTitle({
 					  title:this.wxOpenData.miniAppName
 					})
@@ -522,6 +527,14 @@
 						 
 						 }
 					}); 
+					uni.setStorage({
+						key: 'themeColor',
+						data: that.themeColor,
+						 success: function () {
+						    // that.uniLogin()
+						 
+						 }
+					}); 
 					if(this.wxOpenData.loginInfo){
 						this.$store.commit('mutationsuserInfo', that.wxOpenData.loginInfo.openUser)
 						this.userInfo=that.wxOpenData.loginInfo.openUser

pages/integral/integralConfirm.vue

@@ -73,6 +73,9 @@
 								icon: 'none',
 								duration: 3000
 							});
+							uni.redirectTo({
+								url:'recordDetail?id='+res.data
+							})
 						}else{
 							uni.showToast({
 								title: res.msg,

pages/shop/goodsDetail.vue

@@ -128,8 +128,8 @@
 				<image src="../../static/timg/share.png" mode="" class="bottomImg"></image>
 				<view class="bottomTxt">分享</view>
 			</button> -->
-			<view class="bottomBtn" @click="ljbuy" v-if="!activityEnd&&info.goodsDownTime">立即购买</view>
-			<view class="bottomBtn" @click="ljbuy" v-if="activityEnd&&!info.goodsDownTime">立即购买</view>
+			<view class="bottomBtn"  :style="{background:'#'+themeColor}" @click="ljbuy" v-if="!activityEnd&&info.goodsDownTime">立即购买</view>
+			<view class="bottomBtn" :style="{background:'#'+themeColor}" @click="ljbuy" v-if="activityEnd&&!info.goodsDownTime">立即购买</view>
 			<view class="bottomBtn2"  v-if="activityEnd&&info.goodsDownTime">抢购结束</view>
 		</view>
 	</view>
@@ -185,7 +185,7 @@
 			</view>
 			
 			<view class="buybtnBox">
-				<view class="buyBtn" @click="goBuy">立即购买</view>
+				<view class="buyBtn" @click="goBuy" :style="{background:'#'+themeColor}">立即购买</view>
 			</view>
 			
 		</view>
@@ -250,6 +250,7 @@
 				shareId:'',
 				shareQrCode:'',
 				scene:'',
+				themeColor:'',
 			}
 		},
 		onLoad(opt) {
@@ -259,13 +260,14 @@
 			if(opt.shareId){
 				this.shareId=opt.shareId
 			}
-			
+		
 			//this.userInfo = uni.getStorageSync("userInfo");
 			this.userInfo=this.$store.state.userInfo;
 			this.ext=this.$common.getExtStoreId();
 			//opt.scene='10003'
 			console.log(opt)
 			if(this.userInfo){
+				this.themeColor = uni.getStorageSync("themeColor");
 				this.wxOpenData=this.$store.state.wxOpenData;
 				if(opt.scene&&opt.scene!='undefined'){
 					this.scene=opt.scene;
@@ -278,6 +280,7 @@
 				this.$common.automaticlogin().then(val => {
 					this.userInfo=this.$store.state.userInfo;
 					this.wxOpenData=this.$store.state.wxOpenData;
+					this.themeColor = uni.getStorageSync("themeColor");
 					if(opt.scene&&opt.scene!='undefined'){
 						this.scene=opt.scene;
 						this.getShareParams()

pages/shop/shop.vue

@@ -193,10 +193,19 @@
 			}
 		},
 		methods: {
+			onPageScroll(e){
+				//console.log(e)
+				//this.scrollTop=e.scrollTop
+			},
 			btnTop(){
-				this.$nextTick(function() {
-						this.scrollTop = 0
-				});
+				uni.pageScrollTo({
+				    scrollTop: 0, 
+				}); 
+				// console.log(this.scrollTop)
+				// this.$nextTick(function() {
+						
+				// 		this.scrollTop = 0
+				// });
 			},
 			onscroll(e){
 				//console.log(e)

utils/common.js

@@ -28,6 +28,8 @@ const automaticlogin = function() {
 				   unionId:extConfig.unionId
 				  },'GET').then(res => {
 					  $store.commit('mutationswxOpenData', res.data);
+					  var themeColor= res.data.themeColor
+					   uni.setStorageSync('themeColor',themeColor);
 					  if(res.data.loginInfo){
 					  	$store.commit('mutationsuserInfo', res.data.loginInfo.openUser)
 					  }