修复内容

1. 会员等级背景图去掉校验
	2. 当查询不到会员等级是，按无会员等级展示
	3. 删除商城首页冗余配置在index中的引用
	4. 换绑推广人时，计算上一个推广人的推广人数
	5. pc后台清除推广人时，更新推广人数量
	6. 保证砍价金额最小为0.01
	7. 修复商品删除时购物车关联删除
	8. 删除商品问题修复
	9. 运费模板——指定包邮，包邮数量类型修改
	10. 签到错误修复
	11. 修复我的优惠券只查询20条的问题
	12. 文章列表修复
	13. 拼团商品详情页数据统计显示问题修复
	14. PC后台，账户详情，持有优惠券列表修复
	15. 支付查询参数修复
	16. 修复过期优惠券可以重复领取
	17. 订单邮费切换地址重复计算修复
	18. 判断是否在指定包邮区域内 必须满足件数 + 金额 才能包邮
	19. 支付页面，切换tab，金额计算问题修复
	20. 物流模板新增、编辑——修复
	21. 去除线下邮费的影响
	22. 订单运费计算重写
	23. 下单页面到店自提合计金额不应该计算商品邮费
	24. 新人券领取后，部分使用时间为空——修复

app/components/Authorize.vue

@@ -112,7 +112,7 @@
 					return;
 				}
 				getLogo().then(res=>{
-					that.logoUrl = res.data.logo_url
+					that.logoUrl = res.data.logoUrl
 					Cache.set(LOGO_URL,that.logoUrl);
 				})
 			},

app/components/countDown/index.vue

@@ -3,11 +3,11 @@
 		<text class="red" v-if="tipText">{{ tipText }}</text>
 		<text class="styleAll" v-if="isDay === true">{{ day }}</text>
 		<text class="timeTxt red" v-if="dayText">{{ dayText }}</text>
-		<text class="styleAll">{{ hour }}</text>
+		<text class="styleAll" :class='isCol?"timeCol":""'>{{ hour }}</text>
 		<text class="timeTxt red" v-if="hourText">{{ hourText }}</text>
-		<text class="styleAll">{{ minute }}</text>
+		<text class="styleAll" :class='isCol?"timeCol":""'>{{ minute }}</text>
 		<text class="timeTxt red" v-if="minuteText">{{ minuteText }}</text>
-		<text class="styleAll">{{ second }}</text>
+		<text class="styleAll" :class='isCol?"timeCol":""'>{{ second }}</text>
 		<text class="timeTxt red" v-if="secondText">{{ secondText }}</text>
 	</view>
 </template>
@@ -48,6 +48,10 @@
 			isDay: {
 				type: Boolean,
 				default: true
+			},
+			isCol: {
+				type: Boolean,
+				default: false
 			}
 		},
 		data: function() {
@@ -68,7 +72,7 @@
 
 				function runTime() {
 					//时间函数
-					let intDiff = that.datatime - Date.parse(new Date())/1000; //获取数据中的时间戳的时间差；
+					let intDiff = that.datatime - Date.parse(new Date()) / 1000; //获取数据中的时间戳的时间差；
 					let day = 0,
 						hour = 0,
 						minute = 0,
@@ -109,12 +113,24 @@
 </script>
 
 <style>
-	.time{
+	.time {
 		display: flex;
 		justify-content: center;
-	} 
-	.red{
+	}
+
+	.red {
 		color: #fc4141;
 		margin: 0 4rpx;
 	}
+
+	.timeCol {
+		width: 40rpx;
+		height: 40rpx;
+		line-height: 40rpx;
+		text-align:center;
+		border-radius: 6px;
+		background: #fff;
+		font-size: 24rpx;
+		color: #E93323;
+	}
 </style>

app/components/couponListWindow/index.vue

@@ -5,7 +5,7 @@
 		   <view class='coupon-list' v-if="coupon.list.length">
 		      <view class='item acea-row row-center-wrapper' v-for="(item,index) in coupon.list" @click="getCouponUser(index,item.id)" :key='index'>
 		        <view class='money acea-row row-column row-center-wrapper' :class='item.isUse?"moneyGray":""'>
-					<view>￥<text class='num'>{{item.money}}</text></view>
+					<view>￥<text class='num'>{{item.money?Number(item.money):''}}</text></view>
 					<view class="pic-num">满{{item.minPrice}}元可用</view>
 				</view>
 		        <view class='text'>

app/components/couponWindow/index.vue

@@ -3,7 +3,7 @@
 		<view class='coupon-window' :class='window==true?"on":""'>
 			<view class='couponWinList'>
 				<view class='item acea-row row-between-wrapper' v-for="(item,index) in couponList" :key="index">
-					<view class='money font-color'>￥<text class='num'>{{item.money}}</text></view>
+					<view class='money font-color'>￥<text class='num'>{{ item.money?Number(item.money):'' }}</text></view>
 					<view class='text'>
 						<view class='name'>购物买{{item.minPrice}}减{{item.money}}</view>
 						<view v-if="item.day>0">领取后{{item.day}}天内可用</view>

app/components/login_mobile/index.vue

@@ -0,0 +1,239 @@
+<template>
+	<view v-if="isUp">
+		<view class="mobile-bg" @click="close"></view>
+		<view class="mobile-mask animated" :class="{slideInUp:isUp}">
+			<view class="input-item">
+				<input type="text" v-model="account" placeholder="输入手机号" />
+			</view>
+			<view class="input-item">
+				<input type="text" v-model="codeNum" placeholder="输入验证码" />
+				<button class="code" :disabled="disabled" @click="code">{{text}}</button>
+			</view>
+			<view class="sub_btn" @click="loginBtn">立即登录</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	const app = getApp();
+	import sendVerifyCode from "@/mixins/SendVerifyCode";
+	import Routine from '@/libs/routine';
+	import {
+		loginMobile,
+		registerVerify,
+		getCodeApi,
+		getUserInfo,
+		phoneSilenceAuth,
+		phoneWxSilenceAuth
+	} from "@/api/user";
+	import { bindingPhone } from '@/api/api.js'
+	import { getUserPhone } from '@/api/public';
+	export default{
+		name:'login_mobile',
+		props:{
+			isUp:{
+				type:Boolean,
+				default:false,
+			},
+			authKey:{
+				type:String,
+				default:'',
+			}
+		},
+		data(){
+			return {
+				keyCode:'',
+				account:'',
+				codeNum:''
+			}
+		},
+		mixins: [sendVerifyCode],
+		mounted() {
+			//this.getCode();
+		},
+		methods:{
+			// 获取验证码
+			async code() {
+				let that = this;
+				if (!that.account) return that.$util.Tips({
+					title: '请填写手机号码'
+				});
+				if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.account)) return that.$util.Tips({
+					title: '请输入正确的手机号码'
+				});
+				await registerVerify(that.account).then(res=>{
+					that.$util.Tips({title:res.msg});
+					that.sendCode();
+				}).catch(err=>{
+					return that.$util.Tips({
+						title:err
+					})
+				})
+			},
+			// 获取验证码api
+			getCode() {
+				let that = this
+				getCodeApi().then(res => {
+					that.keyCode = res.data.key;
+				}).catch(res => {
+					that.$util.Tips({
+						title: res
+					});
+				});
+			},
+			close(){
+				this.$emit('close',false)
+			},
+			// 登录
+			loginBtn(){
+				let that = this
+				if (!that.account) return that.$util.Tips({
+					title: '请填写手机号码'
+				});
+				if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.account)) return that.$util.Tips({
+					title: '请输入正确的手机号码'
+				});
+				if (!that.codeNum) return that.$util.Tips({
+					title: '请填写验证码'
+				});
+				if (!/^[\w\d]+$/i.test(that.codeNum)) return that.$util.Tips({
+					title: '请输入正确的验证码'
+				});
+				uni.showLoading({ title: '正在登录中' });
+				getUserPhone({
+					captcha: that.codeNum,
+					phone: that.account,
+					spid: app.globalData.spid,
+					spread: app.globalData.code,
+					type: 'public',
+					key: this.authKey
+				}).then(res=>{
+					let time = res.data.expires_time - this.$Cache.time();
+					this.$store.commit('LOGIN', {
+						token: res.data.token,
+						time: time
+					});
+					this.getUserInfo();
+				}).catch(error=>{
+					uni.hideLoading()
+					this.$util.Tips({
+						title:error
+					})
+				})
+			},
+			// #ifdef MP
+			phoneSilenceAuth(code){
+				let self = this
+				phoneSilenceAuth({
+					code:code,
+					spid: app.globalData.spid,
+					spread: app.globalData.code,
+					phone:this.account,
+					captcha:this.codeNum
+				}).then(res=>{
+					let time = res.data.expires_time - this.$Cache.time();
+					this.$store.commit('LOGIN', {
+						token: res.data.token,
+						time: time
+					});
+					this.getUserInfo();
+				}).catch(error=>{
+					self.$util.Tips({
+						title:error
+					})
+				})
+			},
+			// #endif
+			/**
+			 * 获取个人用户信息
+			 */
+			getUserInfo: function() {
+				let that = this;
+				getUserInfo().then(res => {
+					uni.hideLoading();
+					that.userInfo = res.data
+					that.$store.commit("SETUID", res.data.uid);
+					that.$store.commit("UPDATE_USERINFO", res.data);
+					// #ifdef MP
+					that.$util.Tips({
+						title:'登录成功',
+						icon:'success'
+					},{
+						tab:3
+					})
+					that.close()
+					// #endif
+					// #ifdef H5
+					that.$emit('wechatPhone',true)
+					// #endif
+				});
+			},
+		}
+	}
+	
+</script>
+
+<style lang="stylus">
+	.mobile-bg{
+		position: fixed;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 100%;
+		background: rgba(0,0,0,0.5);
+	}
+	.mobile-mask {
+		z-index: 20;
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		width: 100%;
+		padding: 67rpx 30rpx;
+		background: #fff;
+		.input-item{
+			display: flex;
+			justify-content: space-between;
+			width: 100%;
+			height: 86rpx;
+			margin-bottom: 38rpx;
+			input{
+				flex: 1;
+				display: block;
+				height: 100%;
+				padding-left: 40rpx;
+				border-radius: 43rpx;
+				border: 1px solid #DCDCDC;
+			}
+			.code{
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 220rpx;
+				height: 86rpx;
+				margin-left: 30rpx;
+				background: rgba(233, 51, 35, 0.05);
+				font-size: 28rpx;
+				color: #E93323;
+				border-radius: 43rpx;
+				&[disabled]{
+					background: rgba(0, 0, 0, 0.05);
+					color: #999;
+				}
+			}
+		}
+		.sub_btn{
+			width: 690rpx;
+			height: 86rpx;
+			line-height: 86rpx;
+			margin-top: 60rpx;
+			background: #E93323;
+			border-radius: 43rpx;
+			color: #fff;
+			font-size: 28rpx;
+			text-align: center;
+		}
+	}
+	.animated{
+		animation-duration:.4s
+	}
+</style>

app/components/login_mobile/routine_phone.vue

@@ -0,0 +1,163 @@
+<template>
+	<view v-if="isPhoneBox">
+		<view class="mobile-bg" @click="close"></view>
+		<view class="mobile-mask animated" :class="{slideInUp:isUp}">
+			<view class="info-box">
+				<image :src="logoUrl"></image>
+				<view class="title">获取授权</view>
+				<view class="txt">获取微信的手机号授权</view>
+			</view>
+			<button class="sub_btn" open-type="getPhoneNumber" @getphonenumber="getphonenumber">获取微信手机号</button>
+		</view>
+	</view>
+</template>
+<script>
+	const app = getApp();
+	import Routine from '@/libs/routine';
+	import {
+		loginMobile,
+		registerVerify,
+		getCodeApi,
+		getUserInfo
+	} from "@/api/user";
+	import { getLogo, silenceAuth, getUserPhone } from '@/api/public';
+	export default{
+		name:'routine_phone',
+		props:{
+			isPhoneBox:{
+				type:Boolean,
+				default:false,
+			},
+			logoUrl:{
+				type:String,
+				default:'',
+			},
+			authKey:{
+				type:String,
+				default:'',
+			}
+		},
+		data(){
+			return {
+				keyCode:'',
+				account:'',
+				codeNum:'',
+				isStatus:false
+			}
+		},
+		mounted() {
+		},
+		methods:{
+			// #ifdef MP
+			// 小程序获取手机号码
+			getphonenumber(e){
+				console.log(e)
+				uni.showLoading({ title: '加载中' });
+				Routine.getCode()
+					.then(code => {
+						this.getUserPhoneNumber(e.detail.encryptedData, e.detail.iv, code);
+					})
+					.catch(error => {
+						uni.hideLoading();
+					});
+			},
+			// 小程序获取手机号码回调
+			getUserPhoneNumber(encryptedData, iv, code) {
+				getUserPhone({
+					encryptedData: encryptedData,
+					iv: iv,
+					code: code,
+					spid: app.globalData.spid,
+					spread: app.globalData.code,
+					key:this.authKey,
+					type: 'routine'
+				})
+					.then(res => {
+						let time = res.data.expires_time - this.$Cache.time();
+						this.$store.commit('LOGIN', {
+							token: res.data.token,
+							time: time
+						});
+						this.getUserInfo();
+					})
+					.catch(res => {
+						console.log(res);
+						uni.hideLoading();
+					});
+			},
+			/**
+			 * 获取个人用户信息
+			 */
+			getUserInfo: function() {
+				let that = this;
+				getUserInfo().then(res => {
+					uni.hideLoading();
+					that.userInfo = res.data
+					that.$store.commit("SETUID", res.data.uid);
+					that.$store.commit("UPDATE_USERINFO", res.data);
+					that.isStatus = true
+					this.close()
+				});
+			},
+			// #endif
+			close(){
+				this.$emit('close',{isStatus:this.isStatus})
+			}
+		}
+	}
+	
+</script>
+
+<style lang="scss">
+	.mobile-bg{
+		position: fixed;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 100%;
+		background: rgba(0,0,0,0.5);
+	}
+	.mobile-mask {
+		z-index: 20;
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		width: 100%;
+		padding: 67rpx 30rpx;
+		background: #fff;
+		.info-box{
+			display:flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+			image{
+				width: 150rpx;
+				height: 150rpx;
+				border-radius: 10rpx;
+			}
+			.title{
+				margin-top: 30rpx;
+				margin-bottom: 20rpx;
+				font-size: 36rpx;
+			}
+			.txt{
+				font-size: 30rpx;
+				color: #868686;
+			}
+		}
+		.sub_btn{
+			width: 690rpx;
+			height: 86rpx;
+			line-height: 86rpx;
+			margin-top: 60rpx;
+			background: #E93323;
+			border-radius: 43rpx;
+			color: #fff;
+			font-size: 28rpx;
+			text-align: center;
+		}
+	}
+	.animated{
+		animation-duration:.4s
+	}
+</style>

app/components/tabNav.vue

@@ -83,7 +83,7 @@
 					index:index
 				}
 				this.parentEmit(obj)
-				// this.$parent.currentTab = index //设置swiper的第几页
+				this.$parent.currentTab = index //设置swiper的第几页
 			},
 			// 导航子类点击
 			childTab(tabClick,index){