diff --git a/api/order.js b/api/order.js
index a170677d..b85ca090 100644
--- a/api/order.js
+++ b/api/order.js
@@ -125,7 +125,7 @@ export function getOrderDetail(uni) {
  */
 export function orderAgain(uni) {
 	return request.post('order/again', {
-		nui: uni
+		orderNo: uni
 	});
 }
 
@@ -161,7 +161,7 @@ export function ordeRefundReason() {
  * @param object data
  */
 export function orderRefundVerify(data) {
-	return request.post('order/refund/verify', data);
+	return request.post('order/refund', data);
 }
 
 /**
@@ -176,7 +176,7 @@ export function orderConfirm(cartId, isNew, addAgain,secKill,combination,bargain
 		secKill: secKill,
 		combination:combination,
 		bargain:bargain
-	}, {}, 1);
+	});
 }
 
 /**
@@ -214,4 +214,20 @@ export function postOrderComputed(key, data) {
  */
 export function qrcodeApi(data) {
 	return request.post('qrcode/str2base64', data, {}, 1);
+}
+
+/**
+ * 微信订单支付
+ * @param object data
+ */
+export function wechatOrderPay(data) {
+	return request.post('pay/payment', data);
+}
+
+/**
+ * 微信查询支付结果
+ * @param object data
+ */
+export function wechatQueryPayResult(data) {
+	return request.get('pay/queryPayResult', data);
 }
\ No newline at end of file
diff --git a/api/public.js b/api/public.js
index 42a6ac65..fd82616c 100644
--- a/api/public.js
+++ b/api/public.js
@@ -78,3 +78,10 @@ export function copyWords() {
   return request.get("copy_words", {}, { noAuth: true });
 }
 
+/**
+ * 首页 获取客服地址
+ * @returns {*}
+ */
+export function kefuConfig() {
+  return request.get("config", {}, { noAuth: true });
+}
\ No newline at end of file
diff --git a/api/user.js b/api/user.js
index 2937d88f..fe38a6da 100644
--- a/api/user.js
+++ b/api/user.js
@@ -390,9 +390,9 @@ export function getlevelInfo()
  * 经验值明细；
  * 
  */
-export function getlevelExpList()
+export function getlevelExpList(data)
 {
-	return request.get("user/expList");
+	return request.get("user/expList",data);
 }
 
 /**
diff --git a/components/Authorize002.vue b/components/Authorize002.vue
deleted file mode 100644
index 0a85d2a2..00000000
--- a/components/Authorize002.vue
+++ /dev/null
@@ -1,154 +0,0 @@
-<template>
-	<view>
-		<view class='Popup' v-if='isShowAuth'>
-		   <image :src='logoUrl'></image>
-		   <view class='title'>授权提醒</view>
-		   <view class='tip'>请授权头像等信息，以便为您提供更好的服务</view>
-		   <view class='bottom flex'>
-		      <view class='item' @click='close'>随便逛逛</view>
-			  <!-- #ifdef APP-PLUS -->
-			  <button class='item grant' @click="setUserInfo">去授权</button>
-			  <!-- #endif -->
-			  <!-- #ifdef MP -->
-			  <button class='item grant'  type="primary" open-type="getPhoneNumber" lang="zh_CN" @getphonenumber="setUserInfo">去授权</button>
-			  <!-- #endif -->
-		   </view>
-		</view>
-		<view class='mask' v-if='isShowAuth' @click='close'></view>
-	</view>
-</template>
-
-<script>
-	const app = getApp();
-	import Cache from '../utils/cache';
-	import { getLogo } from '../api/public';
-	import { LOGO_URL } from '../config/cache';
-	import { mapGetters } from 'vuex';
-	import Routine from '../libs/routine';
-	
-	export default {
-		name:'Authorize',
-		props:{
-			isAuto:{
-				type:Boolean,
-				default:true
-			},
-			isGoIndex:{
-				type:Boolean,
-				default:true
-			},
-			isShowAuth:{
-				type:Boolean,
-				default:false
-			}
-		},
-		data(){
-			return {
-				logoUrl:''
-			}
-		},
-		computed:mapGetters(['isLogin','userInfo']),
-		watch:{
-			isLogin(n){
-				n === true && this.$emit('onLoadFun',this.userInfo);
-			}
-		},
-		created() {
-			this.getLogoUrl();
-			this.setAuthStatus();
-		},
-		methods:{
-			setAuthStatus(){
-				Routine.authorize().then(res=>{
-					if(res.islogin === false)
-						this.setUserInfo();
-					else
-						this.$emit('onLoadFun',this.userInfo);
-				}).catch(res=>{
-					if (this.isAuto) 
-						this.$emit('authColse',true);
-				})
-			},
-			getUserInfo(code){
-				console.log(456);
-				Routine.getUserInfo().then(res=>{
-					console.log(123);
-					console.log(res);
-					let userInfo = res.userInfo
-					userInfo.code = code;
-					userInfo.spread_spid = app.globalData.spid;//获取推广人ID
-					userInfo.spread_code = app.globalData.code;//获取推广人分享二维码ID
-					userInfo.avatar  = userInfo.userInfo.avatarUrl;
-					userInfo.city  = userInfo.userInfo.city;
-					userInfo.country  = userInfo.userInfo.country;
-					userInfo.nickName  = userInfo.userInfo.nickName;
-					userInfo.province  = userInfo.userInfo.province;
-					userInfo.sex  = userInfo.userInfo.gender;
-					Routine.authUserInfo(code,userInfo).then(res=>{
-						uni.hideLoading();
-						this.$emit('authColse',false);
-						this.$emit('onLoadFun',this.userInfo);
-					}).catch(res=>{
-						uni.hideLoading();
-						uni.showToast({
-							title:res.msg,
-							icon:'none',
-							duration:2000
-						});
-					})
-				}).catch(res =>{
-					uni.hideLoading();
-				})
-			},
-			setUserInfo(e){
-				console.log('78878787');
-				console.log(e);
-				uni.showLoading({title:'正在登录中'});
-				if(e.detail.errMsg == "getPhoneNumber:ok"){
-					console.log('授权成功');
-					Routine.getCode().then(code=>{
-						console.log(code);
-						this.getUserInfo(code);
-					}).catch(res=>{
-						uni.hideLoading();
-					})
-				}
-			},
-			getLogoUrl(){
-				let that = this;
-				if (Cache.has(LOGO_URL)) {
-					this.logoUrl = Cache.get(LOGO_URL);
-					return;
-				}
-				getLogo().then(res=>{
-					that.logoUrl = res.data.logo_url
-					Cache.set(LOGO_URL,that.logoUrl);
-				})
-			},
-			close(){
-				let pages = getCurrentPages(), currPage  = pages[pages.length - 1];
-				if(this.isGoIndex){
-					uni.switchTab({url:'/pages/index/index'});
-				} else {
-					this.$emit('authColse',false);
-				}
-				// if (currPage && currPage.isShowAuth != undefined){
-				// 	currPage.isShowAuth = true;
-				// }
-			},
-		}
-	}
-</script>
-
-<style scoped lang='scss'>
-	.Popup{width:500rpx;background-color:#fff;position:fixed;top:50%;left:50%;margin-left:-250rpx;transform:translateY(-50%);z-index:320;}
-	.Popup image{width:150rpx;height:150rpx;margin:-67rpx auto 0 auto;display:block;border: 8rpx solid #fff;border-radius: 50%}
-	.Popup .title{font-size:28rpx;color:#000;text-align:center;margin-top: 30rpx}
-	.Popup .tip{font-size:22rpx;color:#555;padding:0 24rpx;margin-top:25rpx;}
-	.Popup .bottom .item{width:50%;height:80rpx;background-color:#eeeeee;text-align:center;line-height:80rpx;font-size:24rpx;color:#666;margin-top:54rpx;}
-	.Popup .bottom .item.on{width: 100%}
-	.flex{display:flex;}
-	.Popup .bottom .item.grant{font-size:28rpx;color:#fff;font-weight:bold;background-color:#e93323;border-radius:0;padding:0;}
-	.mask{position:fixed;top:0;right:0;left:0;bottom:0;background-color:rgba(0,0,0,0.65);z-index:310;}
-	
-</style>
diff --git a/components/couponListWindow/index.vue b/components/couponListWindow/index.vue
index 852464f6..8edaf138 100644
--- a/components/couponListWindow/index.vue
+++ b/components/couponListWindow/index.vue
@@ -9,16 +9,17 @@
 					<view class="pic-num">满{{item.minPrice}}元可用</view>
 				</view>
 		        <view class='text'>
-					 <view class='condition line1'>
-					    <span class='line-title' :class='item.isUse?"gray":""' v-if='item.type===0'>通用劵</span>
-					    <span class='line-title' :class='item.isUse?"gray":""' v-else-if='item.type===1'>品类券</span>
-					    <span class='line-title' :class='item.isUse?"gray":""' v-else>商品券</span>
+					 <view class='condition line2'>
+					    <span class='line-title' :class='item.isUse?"gray":""' v-if='item.useType===1'>通用</span>
+					    <span class='line-title' :class='item.isUse?"gray":""' v-else-if='item.useType===3'>品类</span>
+					    <span class='line-title' :class='item.isUse?"gray":""' v-else>商品</span>
 					    <span>{{item.name}}</span>
 					</view>
 		            <view class='data acea-row row-between-wrapper'>
-		              <view>{{ item.receiveStartTime ? item.receiveStartTime + " ~ " : ""}}{{ item.receiveEndTime }}</view>
-		              <view class='bnt gray' v-if="item.isUse">{{item.use_title || '已领取'}}</view>
-		              <view class='bnt bg-color' v-else>{{coupon.statusTile || '立即领取'}}</view>
+					  <view v-if="item.day>0">领取后{{item.day}}天内可用</view>
+					  <view v-else>{{ item.useStartTimeStr&& item.useEndTimeStr ? item.useStartTimeStr + " - " + item.useEndTimeStr : ""}}</view>
+					  <view class='bnt gray' v-if="item.isUse">{{item.use_title || '已领取'}}</view>
+					  <view class='bnt bg-color' v-else>{{coupon.statusTile || '立即领取'}}</view>
 		            </view>
 		        </view>
 		      </view>
diff --git a/components/couponListWindow/备份.vue b/components/couponListWindow/备份.vue
deleted file mode 100644
index 23359206..00000000
--- a/components/couponListWindow/备份.vue
+++ /dev/null
@@ -1,173 +0,0 @@
-<template>
-	<view>
-		<view class='coupon-list-window' :class='coupon.coupon==true?"on":""'>
-			<view class='title'>优惠券<text class='iconfont icon-guanbi' @click='close'></text></view>
-			<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)"
-				 :key='index'>
-					<view class='money'>
-						<div>
-							￥<span class="num">{{ item.coupon_price }}</span>
-						</div>
-						<div class="pic-num">满{{ item.use_min_price }}元可用</div>
-					</view>
-					<view class='text'>
-						<view class='condition line1'>
-							<span class="line-title" v-if="item.type === 0">通用劵</span>
-							<span class="line-title" v-else-if="item.type === 1">品类券</span>
-							<span class="line-title" v-else>商品券</span>
-							<span>{{ item.title }}</span>
-						</view>
-						<view class='data acea-row row-between-wrapper'>
-							<view>{{ item.start_time ? item.start_time + "-" : ""}}{{ item.end_time }}</view>
-							<view class="iconfont icon-xuanzhong1 font-color-red" v-if="checked.id === item.id"></view>
-							<view v-else class="iconfont icon-weixuanzhong"></view v-else>
-							<!-- <view class='bnt gray' v-if="item.is_use">{{item.use_title || '已领取'}}</view>
-							<view class='bnt bg-color' v-else>{{coupon.statusTile || '立即领取'}}</view> -->
-						</view>
-					</view>
-				</view>
-			</view>
-			<!-- 无优惠券 -->
-			<view class='pictrue' v-else>
-				<image src='../../static/images/noCoupon.png'></image>
-			</view>
-		</view>
-		<view class='mask' catchtouchmove="true" :hidden='coupon.coupon==false' @click='close'></view>
-	</view>
-</template>
-
-<script>
-	import {
-		setCouponReceive
-	} from '@/api/api.js';
-	export default {
-		props: {
-			//打开状态 0=领取优惠券,1=使用优惠券
-			openType: {
-				type: Number,
-				default: 0,
-			},
-			coupon: {
-				type: Object,
-				default: function() {
-					return {};
-				}
-			},
-			checked:{
-				type: Object,
-				default: function() {
-					return {};
-				}
-			},
-		},
-		data() {
-			return {
-
-			};
-		},
-
-		methods: {
-			close: function() {
-				this.$emit('ChangCouponsClone');
-			},
-			getCouponUser: function(index, item) {
-				let that = this;
-				let list = that.coupon.list;
-				that.$emit('ChangCoupons', item);
-				// if (list[index].is_use == true && this.openType == 0) return true;
-				// switch (this.openType) {
-				// 	case 0:
-				// 		//领取优惠券
-				// 		setCouponReceive(id).then(res => {
-				// 			that.$emit('ChangCouponsUseState', index);
-				// 			that.$util.Tips({
-				// 				title: "领取成功"
-				// 			});
-				// 			that.$emit('ChangCoupons', list[index]);
-				// 		})
-				// 		break;
-				// 	case 1:
-				// 		that.$emit('ChangCoupons', index);
-				// 		break;
-				// }
-			}
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	.coupon-list-window {
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		width: 100%;
-		background-color: #f5f5f5;
-		border-radius: 16rpx 16rpx 0 0;
-		z-index: 555;
-		transform: translate3d(0, 100%, 0);
-		transition: all .3s cubic-bezier(.25, .5, .5, .9);
-	}
-
-	.coupon-list-window.on {
-		transform: translate3d(0, 0, 0);
-	}
-
-	.coupon-list-window .title {
-		height: 124rpx;
-		width: 100%;
-		text-align: center;
-		line-height: 124rpx;
-		font-size: 32rpx;
-		font-weight: bold;
-		position: relative;
-	}
-
-	.coupon-list-window .title .iconfont {
-		position: absolute;
-		right: 30rpx;
-		top: 50%;
-		transform: translateY(-50%);
-		font-size: 35rpx;
-		color: #8a8a8a;
-		font-weight: normal;
-	}
-
-	.coupon-list-window .coupon-list {
-		margin: 0 0 50rpx 0;
-		height: 550rpx;
-		overflow: auto;
-	}
-
-	.coupon-list-window .pictrue {
-		width: 414rpx;
-		height: 336rpx;
-		margin: 0 auto 50rpx auto;
-	}
-
-	.coupon-list-window .pictrue image {
-		width: 100%;
-		height: 100%;
-	}
-	.coupon-list .item .money{
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		.pic-num{
-			color: #ffffff;
-			font-size: 24rpx;
-		}
-	}
-	.condition .line-title{
-		width: 90rpx;
-		padding: 0 10rpx;
-		box-sizing: border-box;
-		background: rgba(255, 247, 247, 1);
-		border: 1px solid rgba(232, 51, 35, 1);
-		opacity: 1;
-		border-radius: 22rpx;
-		font-size: 20rpx;
-		color: #e83323;
-		margin-right: 12rpx;
-	}
-</style>
diff --git a/components/couponWindow/index.vue b/components/couponWindow/index.vue
index b22660c0..b0428035 100644
--- a/components/couponWindow/index.vue
+++ b/components/couponWindow/index.vue
@@ -6,7 +6,8 @@
 					<view class='money font-color'>￥<text class='num'>{{item.money}}</text></view>
 					<view class='text'>
 						<view class='name'>购物买{{item.minPrice}}减{{item.money}}</view>
-						<view>{{item.receiveStartTime ? item.receiveStartTime+'~' : ''}}{{item.receiveEndTime}}</view>
+						<view v-if="item.day>0">领取后{{item.day}}天内可用</view>
+						<view v-else>{{item.useStartTimeStr&&item.useEndTimeStr ? item.useStartTimeStr+'~'+item.useEndTimeStr : ''}}</view>
 					</view>
 				</view>
 			</view>
diff --git a/components/payment/index.vue b/components/payment/index.vue
index 7167e20d..36628ec3 100644
--- a/components/payment/index.vue
+++ b/components/payment/index.vue
@@ -25,7 +25,8 @@
 
 <script>
 	import {
-		orderPay
+		orderPay,
+		wechatOrderPay
 	} from '@/api/order.js';
 	export default {
 		props: {
@@ -69,36 +70,23 @@
 				});
 				uni.showLoading({
 					title: '支付中'
-				});
-				orderPay({
-					uni: that.order_id,
-					paytype: paytype,
-					// #ifdef MP 
-					'from': 'routine',
-					// #endif
-					// #ifdef H5 || APP-PLUS
-					'from': this.$wechat.isWeixin() ? 'public' : 'weixinh5'
-					// #endif
-					// // #ifdef H5
-					// quitUrl: location.port ? location.protocol + '//' + location.hostname + ':' + location.port + '/pages/users/order_details/index?order_id=' + this.order_id : location.protocol + '//' + location.hostname + 
-					// '/pages/users/order_details/index?order_id=' + that.order_id
-					// // #endif
+				}); 
+				wechatOrderPay({
+					orderNo: that.order_id,
+					payChannel: this.$wechat.isWeixin() ? 'public' : 'weixinh5',
+					payType: paytype
 				}).then(res => {
-					switch (paytype) {
+					let jsConfig = res.data.jsConfig;
+					switch (res.data.payType) {
 						case 'weixin':
-							if (res.data.result === undefined) return that.$util.Tips({
-								title: '缺少支付参数'
-							});
-							// #ifdef MP || APP-PLUS
-							let jsConfig = res.data.jsConfig;
-							// let packages = 'prepay_id=' + jsConfig.prepayId;
+							// #ifdef MP
 							uni.requestPayment({
-								timeStamp: jsConfig.timeStamp.toString(),
+								timeStamp: jsConfig.timeStamp,
 								nonceStr: jsConfig.nonceStr,
-								package: jsConfig.package,
+								package: jsConfig.packages,
 								signType: jsConfig.signType,
 								paySign: jsConfig.paySign,
-								success: function(res) {
+								success: function(ress) {
 									uni.hideLoading();
 									return that.$util.Tips({
 										title: '支付成功',
@@ -129,21 +117,25 @@
 										});
 									});
 								},
-							});
+							})
 							// #endif
 							// #ifdef H5
-							if (res.data.status === "WECHAT_PAY") {
-								let jsConfig = res.data.jsConfig;
-								//let packages = 'prepay_id=' + jsConfig.prepayId;
-								let datas = {
-									timestamp:jsConfig.timeStamp,
-									nonceStr:jsConfig.nonceStr,
-									package:jsConfig.package,
-									signType:jsConfig.signType,
-									paySign:jsConfig.paySign
-								};
-								that.$wechat.pay(datas)
-									.then(() => {
+							let datas = {
+								timestamp: jsConfig.timeStamp,
+								nonceStr: jsConfig.nonceStr,
+								package: jsConfig.packages,
+								signType: jsConfig.signType,
+								paySign: jsConfig.paySign
+							};
+							that.$wechat.pay(datas).then(res => {
+								if (res.errMsg == 'chooseWXPay:cancel') {
+									return that.$util.Tips({
+										title: '支付失败'
+									});
+								} else {
+									wechatQueryPayResult({
+										orderNo: that.order_id
+									}).then(res => {
 										return that.$util.Tips({
 											title: "支付成功",
 											icon: 'success'
@@ -152,24 +144,14 @@
 												action: 'pay_complete'
 											});
 										});
-									})
-									.catch(function() {
+									}).cache(errW => {
 										return that.$util.Tips({
-											title: '支付失败'
+											title: errW
 										});
-									});
-							} else {
-								uni.hideLoading();
-								location.replace(res.data.jsConfig.h5PayUrl);
-								return that.$util.Tips({
-									title: "支付成功",
-									icon: 'success'
-								}, () => {
-									that.$emit('onChangeFun', {
-										action: 'pay_complete'
-									});
-								});
-							}
+									})
+								}
+
+							})
 							// #endif
 							break;
 						case 'yue':
@@ -183,18 +165,132 @@
 								});
 							});
 							break;
-						case 'offline':
-							uni.hideLoading();
-							return that.$util.Tips({
-								title: '线下支付成功',
-								icon: 'success'
-							}, () => {
-								that.$emit('onChangeFun', {
-									action: 'pay_complete'
-								});
-							});
-							break;
+					    case 'weixinh5':
+						  uni.hideLoading();
+						  location.replace(jsConfig.mwebUrl);
+						  return that.$util.Tips({
+						  	title: "支付成功",
+						  	icon: 'success'
+						  }, () => {
+						  	that.$emit('onChangeFun', {
+						  		action: 'pay_complete'
+						  	});
+						  });
+							break;	
 					}
+
+
+
+					// switch (paytype) {
+					// 	case 'weixin':
+					// 		if (res.data.result === undefined) return that.$util.Tips({
+					// 			title: '缺少支付参数'
+					// 		});
+					// 		// #ifdef MP || APP-PLUS
+					// 		let jsConfig = res.data.jsConfig;
+					// 		uni.requestPayment({
+					// 			timeStamp: jsConfig.timeStamp.toString(),
+					// 			nonceStr: jsConfig.nonceStr,
+					// 			package: jsConfig.package,
+					// 			signType: jsConfig.signType,
+					// 			paySign: jsConfig.paySign,
+					// 			success: function(res) {
+					// 				uni.hideLoading();
+					// 				return that.$util.Tips({
+					// 					title: '支付成功',
+					// 					icon: 'success'
+					// 				}, () => {
+					// 					that.$emit('onChangeFun', {
+					// 						action: 'pay_complete'
+					// 					});
+					// 				});
+					// 			},
+					// 			fail: function(e) {
+					// 				uni.hideLoading();
+					// 				return that.$util.Tips({
+					// 					title: '取消支付'
+					// 				}, () => {
+					// 					that.$emit('onChangeFun', {
+					// 						action: 'pay_fail'
+					// 					});
+					// 				});
+					// 			},
+					// 			complete: function(e) {
+					// 				uni.hideLoading();
+					// 				if (e.errMsg == 'requestPayment:cancel') return that.$util.Tips({
+					// 					title: '取消支付'
+					// 				}, () => {
+					// 					that.$emit('onChangeFun', {
+					// 						action: 'pay_fail'
+					// 					});
+					// 				});
+					// 			},
+					// 		});
+					// 		// #endif
+					// 		// #ifdef H5
+					// 		if (res.data.status === "WECHAT_PAY") {
+					// 			let jsConfig = res.data.jsConfig;
+					// 			//let packages = 'prepay_id=' + jsConfig.prepayId;
+					// 			let datas = {
+					// 				timestamp:jsConfig.timeStamp,
+					// 				nonceStr:jsConfig.nonceStr,
+					// 				package:jsConfig.package,
+					// 				signType:jsConfig.signType,
+					// 				paySign:jsConfig.paySign
+					// 			};
+					// 			that.$wechat.pay(datas)
+					// 				.then(() => {
+					// 					return that.$util.Tips({
+					// 						title: "支付成功",
+					// 						icon: 'success'
+					// 					}, () => {
+					// 						that.$emit('onChangeFun', {
+					// 							action: 'pay_complete'
+					// 						});
+					// 					});
+					// 				})
+					// 				.catch(function() {
+					// 					return that.$util.Tips({
+					// 						title: '支付失败'
+					// 					});
+					// 				});
+					// 		} else {
+					// 			uni.hideLoading();
+					// 			location.replace(res.data.jsConfig.h5PayUrl);
+					// 			return that.$util.Tips({
+					// 				title: "支付成功",
+					// 				icon: 'success'
+					// 			}, () => {
+					// 				that.$emit('onChangeFun', {
+					// 					action: 'pay_complete'
+					// 				});
+					// 			});
+					// 		}
+					// 		// #endif
+					// 		break;
+					// 	case 'yue':
+					// 		uni.hideLoading();
+					// 		return that.$util.Tips({
+					// 			title: '余额支付成功',
+					// 			icon: 'success'
+					// 		}, () => {
+					// 			that.$emit('onChangeFun', {
+					// 				action: 'pay_complete'
+					// 			});
+					// 		});
+					// 		break;
+					// 	case 'offline':
+					// 		uni.hideLoading();
+					// 		return that.$util.Tips({
+					// 			title: '线下支付成功',
+					// 			icon: 'success'
+					// 		}, () => {
+					// 			that.$emit('onChangeFun', {
+					// 				action: 'pay_complete'
+					// 			});
+					// 		});
+					// 		break;
+					// }
 				}).catch(err => {
 					uni.hideLoading();
 					return that.$util.Tips({
diff --git a/components/productWindow/index.vue b/components/productWindow/index.vue
index b7abf08c..1aaa9367 100644
--- a/components/productWindow/index.vue
+++ b/components/productWindow/index.vue
@@ -93,7 +93,6 @@
 			return {};
 		},
 		mounted() {
-			console.log(this.attr)
 		},
 		methods: {
 			    goCat:function(){
diff --git a/components/tabNav.vue b/components/tabNav.vue
index bf157294..c9eded2e 100644
--- a/components/tabNav.vue
+++ b/components/tabNav.vue
@@ -12,7 +12,7 @@
 			<scroll-view scroll-x="true" style="white-space: nowrap; display: flex;align-items: center; height: 100%;" scroll-with-animation :scroll-left="tabLeft" show-scrollbar="false">
 				<view class="wrapper">
 					<view v-for="(item,index) in tabTitle[tabClick].child?tabTitle[tabClick].child:[]" :key="index" class="child-item" :class="{on:index == childIndex}" @click="childTab(tabClick,index)">
-						<image :src="item.extra" mode=""></image>
+						<image :src="item.extra" mode="" :style="{'background-color':item.extra?'none':'#f7f7f7'}"></image>
 						<view class="txt line1">{{item.name}}</view>
 					</view>
 				</view>
diff --git a/components/userEvaluation/index.vue b/components/userEvaluation/index.vue
index 053e00f1..76d10a79 100644
--- a/components/userEvaluation/index.vue
+++ b/components/userEvaluation/index.vue
@@ -11,10 +11,12 @@
 						<view class="start" :class="'star' + item.productScore"></view>
 					</view>
 					<view class="time">{{ item.createTime }}</view>
-					<!-- <view class="time">{{ item.createTime }} {{ item.suk }}</view> -->
+					<!-- <view class="time">{{ item.createTime }}</view>
+					<view class="time">{{ item.suk }}</view> -->
+					<!-- <view class="time">{{ item.createTime }} {{ item.sku }}</view> -->
 				</view>
-				
 			</view>
+			<view class="time">规格：{{ item.sku?item.sku:'无' }}</view>
 			<view class="evaluate-infor">{{ item.comment }}</view>
 			<view class="imgList acea-row" v-if="item.pics.length && item.pics[0]">
 				<view class="pictrue" v-for="(itemn, indexn) in item.pics" :key="indexn">
diff --git a/components/wPicker/w-picker.js b/components/wPicker/w-picker.js
index 28a9baa3..05948357 100644
--- a/components/wPicker/w-picker.js
+++ b/components/wPicker/w-picker.js
@@ -648,7 +648,6 @@ const initPicker={
 			let bDate=new Date(tYear,curMonth,curDate).getTime();
 			let months=[];
 			if(bDate-aDate>0){
-				console.log(1)
 				for(let m=1;m<=12;m++){
 					months.push(forMatNum(m));
 				};
diff --git a/components/wPicker/w-picker.vue b/components/wPicker/w-picker.vue
index b83d5971..dae62b74 100644
--- a/components/wPicker/w-picker.vue
+++ b/components/wPicker/w-picker.vue
@@ -312,7 +312,6 @@
 			},
 			defaultVal(val){
 				this.initData();
-				console.log(val)
 			},
 			areaCode(){
 				this.initData();
diff --git a/libs/wechat.js b/libs/wechat.js
index 56568cbc..f5b170af 100644
--- a/libs/wechat.js
+++ b/libs/wechat.js
@@ -51,16 +51,13 @@ class AuthWechat {
 			// if (this.status && !this.isAndroid()) return resolve(this.instance);
 			getWechatConfig()
 				.then(res => {
-					let data = res.data;
-					// delete data.jsApiTicket;
-					this.instance.config(data);
-					this.initConfig = data;
+					this.instance.config(res.data);
+					this.initConfig = res.data;
 					this.status = true;
 					this.instance.ready(() => {
 						resolve(this.instance);
 					})
 				}).catch(err => {
-					console.log(err);
 					this.status = false;
 					reject(err);
 				});
@@ -124,14 +121,15 @@ class AuthWechat {
 				this.toPromise(wx.chooseWXPay, config).then(res => {
 					resolve(res);
 				}).catch(res => {
-					reject(res);
+					console.log('js中的错误',res)
+					resolve(res);
 				});
 			}).catch(res => {
 				reject(res);
 			});
 		});
 	}
-
+	
 	toPromise(fn, config = {}) {
 		return new Promise((resolve, reject) => {
 			fn({
@@ -174,7 +172,6 @@ class AuthWechat {
 	auth(code) {
 		return new Promise((resolve, reject) => {
 			let loginType = Cache.get(LOGINTYPE);
-			console.log('spread', Cache.get("spread"))
 			wechatAuth(code, Cache.get("spread"), loginType)
 				.then(({
 					data
@@ -252,7 +249,6 @@ class AuthWechat {
 					})
 				},
 				success(res) {
-					console.log(res);
 					return resolve(res,2222);
 				}
 			};
diff --git a/pages/activity/goods_bargain_details/index.vue b/pages/activity/goods_bargain_details/index.vue
index 80ba89e9..b5a7a75c 100644
--- a/pages/activity/goods_bargain_details/index.vue
+++ b/pages/activity/goods_bargain_details/index.vue
@@ -359,7 +359,6 @@
 			}
 			
 			if (this.isLogin) {
-				console.log(that.bargainUid,'that.bargainUid')
 				if(that.bargainUid == 'undefined'){
 					that.bargainUid = that.$store.state.app.uid
 				}
diff --git a/pages/activity/goods_combination_details/index.vue b/pages/activity/goods_combination_details/index.vue
index 1bfef03a..fbd8f9db 100644
--- a/pages/activity/goods_combination_details/index.vue
+++ b/pages/activity/goods_combination_details/index.vue
@@ -314,7 +314,9 @@
 					isState: true, //默认不显示
 				},
 				tagStyle: {
-					img: 'width:100%;'
+					img: 'width:100%;display:block;',
+					table: 'width:100%',
+					video: 'width:100%'
 				},
 				posters: false,
 				weixinStatus: false,
@@ -531,53 +533,6 @@
 					});
 			},
 			//#endif
-			// setTime: function() { //到期时间戳
-			// 	var that = this;
-			// 	var endTimeList = that.pink;
-			// 	that.pink.map(item => {
-			// 		item.time = {
-			// 			day: '00',
-			// 			hou: '00',
-			// 			min: '00',
-			// 			sec: '00'
-			// 		};
-			// 	});
-			// 	var countDownArr = [];
-			// 	var timeer = setInterval(function() {
-			// 		var newTime = new Date().getTime() / 1000;
-			// 		for (var i in endTimeList) {
-			// 			var endTime = endTimeList[i].stop_time;
-			// 			var obj = [];
-			// 			if (endTime - newTime > 0) {
-			// 				var time = endTime - newTime;
-			// 				var day = parseInt(time / (60 * 60 * 24));
-			// 				var hou = parseInt(time % (60 * 60 * 24) / 3600);
-			// 				var min = parseInt(time % (60 * 60 * 24) % 3600 / 60);
-			// 				var sec = parseInt(time % (60 * 60 * 24) % 3600 % 60);
-			// 				hou = parseInt(hou) + parseInt(day * 24);
-			// 				obj = {
-			// 					day: that.timeFormat(day),
-			// 					hou: that.timeFormat(hou),
-			// 					min: that.timeFormat(min),
-			// 					sec: that.timeFormat(sec)
-			// 				}
-			// 			} else {
-			// 				obj = {
-			// 					day: '00',
-			// 					hou: '00',
-			// 					min: '00',
-			// 					sec: '00'
-			// 				}
-			// 			}
-			// 			endTimeList[i].time = obj;
-			// 		}
-			// 		that.pink = endTimeList
-			// 	}, 1000);
-			// 	that.timeer = timeer
-			// },
-			// timeFormat(param) { //小于10的格式化函数
-			// 	return param < 10 ? '0' + param : param;
-			// },
 			/**
 			 * 默认选中属性
 			 * 
@@ -936,7 +891,7 @@
 						let storeName = that.storeInfo.title;
 						let price = that.storeInfo.price;
 						setTimeout(() => {
-							that.$util.PosterCanvas(arrImages, storeName, price, function(tempFilePath) {
+							that.$util.PosterCanvas(arrImages, storeName, price, that.storeInfo.otPrice, function(tempFilePath) {
 								that.posterImage = tempFilePath;
 								that.canvasStatus = true;
 							});	
diff --git a/pages/activity/goods_combination_status/index.vue b/pages/activity/goods_combination_status/index.vue
index 2a79e0ae..39dda065 100644
--- a/pages/activity/goods_combination_status/index.vue
+++ b/pages/activity/goods_combination_status/index.vue
@@ -425,13 +425,6 @@ export default {
 			that.isOpen = true;
 		},
 		goPay() {
-			// productId: that.storeInfo.productId,
-			// combinationId:parseFloat(that.id),
-			// cartNum: that.cart_num ? this.cart_num : this.attribute.productSelect.cart_num,
-			// productAttrUnique: productSelect !== undefined ? productSelect.id : '',
-			// isNew: true,
-			
-			
 			var that = this;
 			var data = {};
 			// that.attr.cartAttr = res;
@@ -441,7 +434,6 @@ export default {
 			data.productAttrUnique = that.attr.productSelect.unique;
 			data.combinationId = that.storeCombination.id;
 			data.isNew = true;
-			console.log(that.pinkId);
 			postCartAdd(data)
 				.then(res => {
 					uni.navigateTo({
diff --git a/pages/activity/goods_seckill_details/index.vue b/pages/activity/goods_seckill_details/index.vue
index f3dd534f..3b36f087 100644
--- a/pages/activity/goods_seckill_details/index.vue
+++ b/pages/activity/goods_seckill_details/index.vue
@@ -245,7 +245,9 @@
 				lock: false,
 				scrollTop: 0,
 				tagStyle: {
-					img: 'width:100%;'
+					img: 'width:100%;display:block;',
+					table: 'width:100%',
+					video: 'width:100%'
 				},
 				datatime: '',
 				navActive: 0,
@@ -581,50 +583,6 @@
 					this.$set(this.attribute.productSelect, "cart_num", num.cart_num);
 				}
 			},
-			// ChangeCartNum: function(changeValue) {
-			// 	//changeValue:是否 加|减
-			// 	//获取当前变动属性
-			// 	let productSelect = this.productValue[this.attrValue];
-			// 	if (this.cart_num) {
-			// 	      productSelect.cart_num = this.cart_num;
-			// 		  this.attribute.productSelect.cart_num = this.cart_num;
-			// 	    }
-			// 	//如果没有属性,赋值给商品默认库存
-			// 	if (productSelect === undefined && !this.attribute.productAttr.length)
-			// 		productSelect = this.attribute.productSelect;
-			// 	//无属性值即库存为0；不存在加减；
-			// 	if (productSelect === undefined) return;
-			// 	let stock = productSelect.stock || 0;
-			// 	let num = this.attribute.productSelect;
-			// 	let quota = productSelect.quota || 0;
-			// 	//设置默认数据
-			// 	if (productSelect.cart_num == undefined) productSelect.cart_num = 1;
-			// 	if (changeValue) {
-			// 		num.cart_num ++;
-			// 		if(quota >= stock){
-			// 			 if (num.cart_num > stock) {
-			// 			 	this.$set(this.attribute.productSelect, "cart_num", stock);
-			// 			 	this.$set(this, "cart_num", stock);
-			// 			 }
-			// 		}else{
-			// 			if (num.cart_num > quota) {
-			// 				this.$set(this.attribute.productSelect, "cart_num", quota);
-			// 				this.$set(this, "cart_num", quota);
-			// 			}
-			// 		}
-			// 		this.$set(this, "cart_num", num.cart_num);
-			// 		this.$set(this.attribute.productSelect, "cart_num", num.cart_num);
-					
-			// 	} else {
-			// 		num.cart_num--;
-			// 		if (num.cart_num < 1) {
-			// 			this.$set(this.attribute.productSelect, "cart_num", 1);
-			// 			this.$set(this, "cart_num", 1);
-			// 		}
-			// 		this.$set(this, "cart_num", num.cart_num);
-			// 		this.$set(this.attribute.productSelect, "cart_num", num.cart_num);
-			// 	}
-			// },
 			attrVal(val) {
 				this.attribute.productAttr[val.indexw].index = this.attribute.productAttr[val.indexw].attrValues[val.indexn];
 			},
@@ -882,20 +840,13 @@
 						let storeName = that.storeInfo.storeName;
 						let price = that.storeInfo.price;
 						setTimeout(() => {
-							that.$util.PosterCanvas(arrImages, storeName, price, function(tempFilePath) {
+							that.$util.PosterCanvas(arrImages, storeName, price, that.storeInfo.otPrice,function(tempFilePath) {
 								that.posterImage = tempFilePath;
 								that.canvasStatus = true;
 							});	
 						}, 200);
 					}
 				});	
-				// let arrImages = [that.posterbackgd, that.imgTop, that.PromotionCode];
-				// let storeName = that.storeInfo.storeName;
-				// let price = that.storeInfo.price;
-				// that.$util.PosterCanvas(arrImages, storeName, price, function(tempFilePath) {
-				// 	that.posterImage = tempFilePath;
-				// 	that.canvasStatus = true;
-				// });
 			},
 			// 小程序二维码
 			getQrcode(){
diff --git a/pages/activity/poster-poster/index.vue b/pages/activity/poster-poster/index.vue
index 2626fa54..42279707 100644
--- a/pages/activity/poster-poster/index.vue
+++ b/pages/activity/poster-poster/index.vue
@@ -158,7 +158,6 @@
 				uni.getImageInfo({
 				            src: arrImages[0],
 				            success: function (image) {
-								console.log('啦啦', image)
 								context.drawImage(arrImages[0], 0, 0, 750, 1190);
 								context.setFontSize(36);
 								context.setTextAlign('center');
@@ -210,19 +209,15 @@
 									  canvasId: 'firstCanvas',
 									  fileType: 'jpg',
 									  success: function(res) {
-										  console.log('啦啦222', res)
 									    // 在H5平台下，tempFilePath 为 base64
 										uni.hideLoading();
-										//successFn && successFn(res.tempFilePath);
 										that.imagePath = res.tempFilePath;
-										console.log(that.imagePath)
 										that.canvasStatus = true;
 									  } 
 									})
 								})
 				            },
 							fail: function(err) {
-								console.log(err)
 								uni.hideLoading();
 								that.$util.Tips({
 									title: '无法获取图片信息'
diff --git a/pages/admin/delivery/index.vue b/pages/admin/delivery/index.vue
index f5bf6ea2..dfcf0ea6 100644
--- a/pages/admin/delivery/index.vue
+++ b/pages/admin/delivery/index.vue
@@ -179,7 +179,6 @@
 			},
 			setInfo: function(item) {
 				let that = this;
-				console.log(item);
 				setAdminOrderDelivery(item).then(
 					res => {
 						that.$util.Tips({
@@ -197,7 +196,6 @@
 				);
 			},
 			bindPickerChange(e){
-				console.log(e,'tar')
 				this.seIndex = e.detail.value
 			}
 		}
diff --git a/pages/admin/orderDetail/index.vue b/pages/admin/orderDetail/index.vue
index 3d959d47..b1edd734 100644
--- a/pages/admin/orderDetail/index.vue
+++ b/pages/admin/orderDetail/index.vue
@@ -301,7 +301,6 @@
 							that.getIndex();
 						},
 						err => {
-							console.log(err, 'err')
 							that.change = false;
 							that.$util.Tips({
 								title: err
@@ -364,13 +363,11 @@
 			// #endif
 			// #ifdef H5
 			webCopy(item, index) {
-				console.log('yunxingle')
 				let items = item
 				let indexs = index
 				let self = this
 
 				if (self.clickNum == 1) {
-					console.log('22')
 					self.clickNum += 1
 					self.webCopy(items, indexs)
 				}
diff --git a/pages/admin/orderList/index.vue b/pages/admin/orderList/index.vue
index 352f1ddd..69994365 100644
--- a/pages/admin/orderList/index.vue
+++ b/pages/admin/orderList/index.vue
@@ -228,7 +228,6 @@
 							that.init();
 						},
 						err => {
-							console.log(err,'err')
 							that.change = false;
 							that.$util.Tips({title: err});
 						}
diff --git a/pages/auth/index.vue b/pages/auth/index.vue
index b9b2b4e9..d199a883 100644
--- a/pages/auth/index.vue
+++ b/pages/auth/index.vue
@@ -25,11 +25,6 @@
 			wechat.auth(code, state)
 				.then(() => {
 					getUserInfo().then(res => {
-						console.log(res);
-						console.log(option.back_url);
-						console.log(decodeURIComponent(
-							decodeURIComponent(option.back_url)
-						));
 						that.$store.commit("SETUID", res.data.uid);
 						location.href = decodeURIComponent(
 							decodeURIComponent(option.back_url)
diff --git a/pages/customer_list/chat.vue b/pages/customer_list/chat.vue
index 32988c64..a8d1965e 100644
--- a/pages/customer_list/chat.vue
+++ b/pages/customer_list/chat.vue
@@ -382,7 +382,6 @@
 			})
 		},
 		onReady: function() {
-			console.log(this.emojiGroup);
 			this.height();
 			this.getHistory();
 			this.getproductInfo();
@@ -417,7 +416,6 @@
 		},
 		methods: {
 			uploadImg() {
-				console.log(this.$store.state.app.token)
 				let self = this
 				uni.chooseImage({
 					count: 1, //默认1
@@ -460,7 +458,6 @@
 			getOrderInfo() {
 				if (!this.orderId) return;
 				getOrderDetail(this.orderId).then(res => {
-					console.log(res)
 					this.orderInfo = res.data;
 					if (this.orderInfo.add_time_h) {
 						this.orderInfo.add_time_h = this.orderInfo.add_time_h.substring(
@@ -511,7 +508,6 @@
 						this.loaded = data.length < this.limit;
 					})
 					.catch(err => {
-						console.log(err);
 						this.$dialog.error(err || "加载失败");
 					});
 			},
@@ -588,7 +584,6 @@
 				if (this.timeOutEvent !== 0 && this.longClick === 0) {
 					//点击
 					//此处为点击事件----在此处添加跳转详情页
-					console.log("这是点击");
 				}
 				this.speak = "按住 说话";
 				this.recording = false;
@@ -643,10 +638,9 @@
 				setTimeout(res=>{
 					let info = uni.createSelectorQuery().select(".chat");
 					info.boundingClientRect(function(data) { //data - 各种参数
-						console.log(data.height) // 获取元素宽度
+						 // 获取元素宽度
 						scrollTop = data.height
 					}).exec()
-					console.log(scrollTop,'scrollTop')
 					if(this.active){
 						this.scrollTop = scrollTop+500
 					}else{
diff --git a/pages/goods_cate/goods_cate.vue b/pages/goods_cate/goods_cate.vue
index e634ddca..62642a31 100644
--- a/pages/goods_cate/goods_cate.vue
+++ b/pages/goods_cate/goods_cate.vue
@@ -25,7 +25,7 @@
 						<view class='list acea-row'>
 							<block v-for="(itemn,indexn) in item.child" :key="indexn">
 								<navigator hover-class='none' :url='"/pages/goods_list/index?cid="+itemn.id+"&title="+itemn.name' class='item acea-row row-column row-middle'>
-									<view class='picture'>
+									<view class='picture' :style="{'background-color':itemn.extra?'none':'#f7f7f7'}">
 										<image :src='itemn.extra'></image>
 									</view>
 									<view class='name line1'>{{itemn.name}}</view>
@@ -241,6 +241,9 @@
 		width: 100%;
 		height: 100%;
 		border-radius: 50%;
+		div{
+			background-color: #f7f7f7;
+		}
 	}
 	
 	.productSort .conter .list .item .name {
diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue
index c7041771..d94b8ef2 100644
--- a/pages/goods_details/index.vue
+++ b/pages/goods_details/index.vue
@@ -29,9 +29,9 @@
 						</view>
 						<view class='introduce'>{{storeInfo.storeName}}</view>
 						<view class='label acea-row row-between-wrapper'>
-							<view>原价:￥{{storeInfo.otPrice}}</view>
-							<view>库存:{{storeInfo.stock}}{{storeInfo.unitName}}</view>
-							<view>销量:{{Number(storeInfo.sales) + Number(storeInfo.ficti) || 0}}{{storeInfo.unitName}}</view>
+							<view>原价:￥{{storeInfo.otPrice || 0}}</view>
+							<view>库存:{{storeInfo.stock || 0}}{{storeInfo.unitName || ''}}</view>
+							<view>销量:{{Math.floor(storeInfo.sales) + Math.floor(storeInfo.ficti) || 0}}{{storeInfo.unitName || ''}}</view>
 						</view>
 						<!-- <view class='coupon acea-row row-between-wrapper' v-if="storeInfo.give_integral > 0">
 							<view class='hide line1 acea-row'>
@@ -148,7 +148,7 @@
 			<navigator open-type='switchTab' class="animated item" :class="animated==true?'bounceIn':''" url='/pages/order_addcart/order_addcart'
 			 hover-class="none">
 				<view class='iconfont icon-gouwuche1'>
-					<text class='num bg-color'>{{CartCount || 0}}</text>
+					<text v-if="Math.floor(CartCount)>0" class='num bg-color'>{{CartCount}}</text>
 				</view>
 				<view>购物车</view>
 			</navigator>
@@ -340,7 +340,9 @@
 				lock: false,
 				scrollTop: 0,
 				tagStyle: {
-					img: 'width:100%;'
+					img: 'width:100%;display:block;',
+					table: 'width:100%',
+					video: 'width:100%'
 				},
 				sliderImage: [],
 				qrcodeSize: 600,
@@ -419,7 +421,6 @@
 		// #endif
 		methods: {
 			getChat(uid){
-				console.log(this.uid)
 				window.yzf && window.yzf.init({
 				      sign: '37ef9b97872756ce2a1596ec4fe9b66b0b4cbeec7b36239a65924fa6cbd5c29ac6b013c274511b2eee929e72312baeeeb97aae86',
 				      token: '', //非必填
@@ -786,7 +787,6 @@
 			DefaultSelect: function() {
 				let productAttr = this.attr.productAttr;
 				let value = [];
-				console.log(this.productValue)
 				for (let key in this.productValue) {
 					if (this.productValue[key].stock > 0) {
 						value = this.attr.productAttr.length ? key.split(",") : [];
@@ -1040,7 +1040,6 @@
 			},
 			// 授权关闭
 			authColse: function(e) {
-				console.log(e, 'eeeee')
 				this.isShowAuth = e
 			},
 			/**
@@ -1116,16 +1115,18 @@
 					//that.PromotionCode = res.data.code;
 					base64src(res.data.code, res => {
 						that.PromotionCode = res;
-						console.log('第一张',that.PromotionCode)
 					});
-				})
+				}).catch(err => {
+					that.$util.Tips({
+						title: err
+					});
+				});
 			},
 			// 生成二维码；
 			make(uid) {
 				let that = this;
 				let href = location.href;
 				href = href.indexOf("?") === -1 ? href + "?spread=" + uid : href + "&spread=" + uid;
-				console.log(href)
 				uQRCode.make({
 					canvasId: 'qrcode',
 					text: href,
@@ -1180,45 +1181,6 @@
 			/**
 			 * 生成海报
 			 */
-			// goPoster: function() {
-			// 	debugger
-			// 	let that = this;
-			// 	that.posters = false;
-				
-			// 	that.$set(that, 'canvasStatus', true);
-			// 	let arr2 = [that.posterbackgd, that.storeImage, that.PromotionCode];
-				
-			// 	// // #ifndef H5
-			// 	if (that.isDown)
-			// 		return that.$util.Tips({
-			// 			title: '正在下载海报,请稍后再试！'
-			// 		});
-			// 	// // #endif
-			// 	uni.getImageInfo({
-			// 		src: that.PromotionCode,
-			// 		fail: function(res) {
-			// 			console.log(res)
-			// 			// #ifdef H5
-			// 			return that.$util.Tips({
-			// 				title: res
-			// 			});
-			// 			// #endif
-			// 			// #ifdef MP
-			// 			return that.$util.Tips({
-			// 				title: '小程序二维码需要发布正式版后才能获取到'
-			// 			});
-			// 			// #endif
-			// 		},
-			// 		success(res) {
-			// 			console.log('成功',res)
-			// 			//生成推广海报
-			// 			that.$util.PosterCanvas(arr2, that.storeInfo.storeName, that.storeInfo.price, function(tempFilePath) {
-			// 						that.imagePath = tempFilePath;
-			// 						that.canvasStatus = true;
-			// 			});
-			// 		}
-			// 	});
-			// },
 			goPoster: function() {
 				let that = this;
 				that.posters = false;
@@ -1232,14 +1194,13 @@
 						let storeName = that.storeInfo.storeName;
 						let price = that.storeInfo.price;
 						setTimeout(() => {
-							that.$util.PosterCanvas(arrImages, storeName, price, function(tempFilePath) {
+							that.$util.PosterCanvas(arrImages, storeName, price, that.storeInfo.otPrice,function(tempFilePath) {
 								that.imagePath = tempFilePath;
 								that.canvasStatus = true;
 							});	
 						}, 200);
 					}
-				});	
-			
+				});
 			},
 			/*
 			 * 保存到手机相册
diff --git a/pages/goods_details/index001.vue b/pages/goods_details/index001.vue
deleted file mode 100644
index 61bdbe34..00000000
--- a/pages/goods_details/index001.vue
+++ /dev/null
@@ -1,1736 +0,0 @@
-<template>
-	<view class="product-con">
-		<view class='navbar' :style="{height:navH+'rpx',opacity:opacity}">
-			<view class='navbarH' :style='"height:"+navH+"rpx;"'>
-				<view class='navbarCon acea-row row-center-wrapper'>
-					<view class="header acea-row row-center-wrapper">
-						<view class="item" :class="navActive === index ? 'on' : ''" v-for="(item,index) in navList" :key='index' @tap="tap(index)">
-							{{ item }}
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class='iconfont icon-xiangzuo' :style="'top:'+navH/2+'rpx'" @tap='returns'></view>
-			<view>
-			   <scroll-view :scroll-top="scrollTop" scroll-y='true' scroll-with-animation="true" :style='"height:"+height+"px;"' @scroll="scroll">
-				<view id="past0">
-					<productConSwiper :imgUrls="sliderImage" :videoline="storeInfo.videoLink"></productConSwiper>
-					<view class='wrapper'>
-						<view class='share acea-row row-between row-bottom'>
-							<view class='money font-color'>
-								￥
-								<text class='num'>{{storeInfo.price}}</text>
-								<text class='vip-money' v-if="storeInfo.vipPrice && storeInfo.vipPrice > 0">￥{{storeInfo.vipPrice}}</text>
-								<image v-if="storeInfo.vipPrice && storeInfo.vipPrice > 0" src="../../static/images/vip.png"></image>
-							</view>
-							<view class='iconfont icon-fenxiang' @click="listenerActionSheet"></view>
-						</view>
-						<view class='introduce'>{{storeInfo.storeName}}</view>
-						<view class='label acea-row row-between-wrapper'>
-							<view>原价:￥{{storeInfo.otPrice}}</view>
-							<view>库存:{{storeInfo.stock}}{{storeInfo.unitName}}</view>
-							<view>销量:{{storeInfo.sales}}{{storeInfo.unitName}}</view>
-						</view>
-						<!-- <view class='coupon acea-row row-between-wrapper' v-if="storeInfo.give_integral > 0">
-							<view class='hide line1 acea-row'>
-								赠积分：
-								<view class='activity'>赠送 {{storeInfo.give_integral}} 积分</view>
-							</view>
-						</view> -->
-						<view class='coupon acea-row row-between-wrapper' @click='couponTap' style="margin-top: 20rpx;">
-							<view class='hide line1 acea-row'>
-								优惠券：
-								<view class='activity' v-for="(item,index) in couponList" :key="index">满{{item.use_min_price}}减{{item.coupon_price}}</view>
-							</view>
-							<view class='iconfont icon-jiantou'></view>
-						</view>
-						<view class="coupon acea-row row-between-wrapper" v-if="activity.length">
-							<view class="line1 acea-row">
-								<text>活&nbsp;&nbsp;&nbsp;动：</text>
-								<view v-for='(item,index) in activity' :key='index' @click="goActivity(item)">
-									<view v-if="item.type === '1'" :class="index==0?'activity_pin':'' || index==1?'activity_miao':'' || index==2?'activity_kan':''">
-										<text class="iconfonts iconfont icon-pintuan"></text>
-										<text class="activity_title"> 参与秒杀</text>
-									</view>
-									<view :class="index==0?'activity_pin':'' || index==1?'activity_miao':'' || index==2?'activity_kan':''" v-if="item.type === '2'">
-										<text class="iconfonts iconfont icon-shenhezhong"></text>
-										<text class="activity_title"> 参与砍价</text>
-									</view>
-									<view :class="index==0?'activity_pin':'' || index==1?'activity_miao':'' || index==2?'activity_kan':''" v-if="item.type === '3'">
-										<text class="iconfonts iconfont icon-kanjia"></text>
-										<text class="activity_title"> 参与拼团</text>
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>
-					<view class='attribute acea-row row-between-wrapper' @click="selecAttr">
-						<view>{{attrTxt}}：
-							<text class='atterTxt'>{{attrValue}}</text>
-						</view>
-						<view class='iconfont icon-jiantou'></view>
-					</view>
-				</view>
-				<view class='userEvaluation' id="past1">
-					<view class='title acea-row row-between-wrapper'>
-						<view>用户评价({{replyCount}})</view>
-						<navigator class='praise' hover-class='none' :url='"/pages/users/goods_comment_list/index?product_id="+id'>
-							<text class='font-color'>{{replyChance}}%</text>好评率
-							<text class='iconfont icon-jiantou'></text>
-						</navigator>
-					</view>
-					<block v-if="replyCount">
-						<userEvaluation :reply="reply"></userEvaluation>
-					</block>
-				</view>
-				<!-- 优品推荐 -->
-				<view class="superior" if='good_list.length' id="past2">
-					<view class="title acea-row row-center-wrapper">
-						<image src="../../static/images/ling.png"></image>
-						<view class="titleTxt">优品推荐</view>
-						<image src="../../static/images/ling.png"></image>
-					</view>
-					<view class="slider-banner banner">
-						<swiper indicator-dots="true" :autoplay="autoplay" :circular="circular" :interval="interval" :duration="duration"
-						 indicator-color="#999" indicator-active-color="#e93323" :style="'height:'+clientHeight+'px'">
-							<swiper-item v-for="(item,indexw) in good_list" :key="indexw">
-								<view class="list acea-row row-middle" :id="'list'+indexw">
-									<view class="item" v-for="(val,indexn) in item.list" :key="indexn" @click="goDetail(val)">
-										<view class="pictrue">
-											<image :src="val.image"></image>
-											<span class="pictrue_log pictrue_log_class" v-if="val.activityH5 && val.activityH5.type === '1'">秒杀</span>
-											<span class="pictrue_log pictrue_log_class" v-if="val.activityH5 && val.activityH5.type === '2'">砍价</span>
-											<span class="pictrue_log pictrue_log_class" v-if="val.activityH5 && val.activityH5.type === '3'">拼团</span>
-										</view>
-										<view class="name line1">{{val.storeName}}</view>
-										<view class="money font-color">¥{{val.price}}</view>
-									</view>
-								</view>
-							</swiper-item>
-							<!-- <view class="swiper-pagination" slot="pagination"></view> -->
-						</swiper>
-					</view>
-				</view>
-				<view class='product-intro' id="past3">
-					<view class='title'>产品介绍</view>
-					<view class='conter'>
-						<jyf-parser :html="description" ref="article" :tag-style="tagStyle"></jyf-parser>
-					</view>
-					<!-- <rich-text :nodes="description" class="conter"></rich-text> -->
-				</view>
-				<view style='height:120rpx;'></view>
-			   </scroll-view>
-			</view>
-		<view class='footer acea-row row-between-wrapper'>
-			<!-- #ifdef MP -->
-			<button open-type="contact" hover-class='none' class='item'>
-				<view class='iconfont icon-kefu'></view>
-				<view>客服</view>
-			</button>
-			<!-- #endif -->
-			<!-- #ifndef MP -->
-			<navigator hover-class="none" class="item" :url="'/pages/customer_list/index?productId='+id">
-				<view class="iconfont icon-kefu"></view>
-				<view>客服</view>
-			</navigator>
-			<!-- #endif -->
-			<view @click="setCollect" class='item'>
-				<view class='iconfont icon-shoucang1' v-if="storeInfo.userCollect"></view>
-				<view class='iconfont icon-shoucang' v-else></view>
-				<view>收藏</view>
-			</view>
-			<navigator open-type='switchTab' class="animated item" :class="animated==true?'bounceIn':''" url='/pages/order_addcart/order_addcart'
-			 hover-class="none">
-				<view class='iconfont icon-gouwuche1'>
-					<text class='num bg-color'>{{CartCount || 0}}</text>
-				</view>
-				<view>购物车</view>
-			</navigator>
-			<view class='bnt acea-row'>
-				<form @submit="joinCart" report-submit='true'>
-					<button class='joinCart bnts' form-type="submit">加入购物车</button>
-				</form>
-				<form @submit="goBuy" report-submit='true'>
-					<button class='buy bnts' form-type="submit">立即购买</button>
-				</form>
-			</view>
-		</view>
-		<shareRedPackets :sharePacket="sharePacket" @listenerActionSheet="listenerActionSheet" @closeChange="closeChange"></shareRedPackets>
-		<!-- 组件 -->
-		<productWindow :attr="attr" :isShow='1' :iSplus='1' @myevent="onMyEvent" @ChangeAttr="ChangeAttr" @ChangeCartNum="ChangeCartNum"
-		 @attrVal="attrVal" @iptCartNum="iptCartNum" id='product-window'></productWindow>
-		<home></home>
-		<couponListWindow :coupon='coupon' @ChangCouponsClone="ChangCouponsClone" @ChangCoupons="ChangCoupons"
-		 @ChangCouponsUseState="ChangCouponsUseState"></couponListWindow>
-		<!-- 分享按钮 -->
-		<view class="generate-posters acea-row row-middle" :class="posters ? 'on' : ''">
-			<!-- #ifndef MP -->
-			<button class="item" hover-class='none' v-if="weixinStatus === true" @click="H5ShareBox = true">
-				<view class="iconfont icon-weixin3"></view>
-				<view class="">发送给朋友</view>
-			</button>
-			<!-- #endif -->
-			<!-- #ifdef MP -->
-			<button class="item" open-type="share" hover-class='none' @click="goFriend">
-				<view class="iconfont icon-weixin3"></view>
-				<view class="">发送给朋友</view>
-			</button>
-			<!-- #endif -->
-			<button class="item" hover-class='none' @click="goPoster">
-				<view class="iconfont icon-haibao"></view>
-				<view class="">生成海报</view>
-			</button>
-		</view>
-		<view class="mask" v-if="posters" @click="listenerActionClose"></view>
-		<!-- #ifdef MP -->
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
-		<!-- #endif -->
-		<!-- 海报展示 -->
-		<view class='poster-pop' v-if="posterImageStatus">
-			<image src='../../static/images/poster-close.png' class='close' @click="posterImageClose"></image>
-			<image :src='posterImage'></image>
-			<!-- #ifndef H5  -->
-			<view class='save-poster' @click="savePosterPath">保存到手机</view>
-			<!-- #endif -->
-			<!-- #ifdef H5 -->
-			<view class="keep">长按图片可以保存到手机</view>
-			<!-- #endif -->
-		</view>
-		<view class='mask' v-if="posterImageStatus"></view>
-		<canvas class="canvas" canvas-id='myCanvas' v-if="canvasStatus"></canvas>
-		<!-- 发送给朋友图片 -->
-		<view class="share-box" v-if="H5ShareBox">
-			<image src="/static/images/share-info.png" @click="H5ShareBox = false"></image>
-		</view>
-	</view>
-</template>
-
-<script>
-	import {
-		getProductDetail,
-		getProductCode,
-		collectAdd,
-		collectDel,
-		postCartAdd,
-		getReplyList,
-		getReplyConfig
-	} from '@/api/store.js';
-	import {
-		getUserInfo,
-		userShare
-	} from '@/api/user.js';
-	import {
-		getCoupons
-	} from '@/api/api.js';
-	import {
-		getCartCounts
-	} from '@/api/order.js';
-	import {
-		toLogin
-	} from '@/libs/login.js';
-	import {
-		mapGetters
-	} from "vuex";
-	import {
-		imageBase64
-	} from "@/api/public";
-	import productConSwiper from '@/components/productConSwiper';
-	import couponListWindow from '@/components/couponListWindow';
-	import productWindow from '@/components/productWindow';
-	import userEvaluation from '@/components/userEvaluation';
-	import shareRedPackets from '@/components/shareRedPackets';
-	import home from '@/components/home';
-	import { silenceBindingSpread } from "@/utils";
-	import parser from "@/components/jyf-parser/jyf-parser";
-	// #ifdef MP
-	import authorize from '@/components/Authorize';
-	// #endif
-	let app = getApp();
-	export default {
-		components: {
-			productConSwiper,
-			couponListWindow,
-			productWindow,
-			userEvaluation,
-			shareRedPackets,
-			home,
-			"jyf-parser": parser,
-			// #ifdef MP
-			authorize
-			// #endif
-		},
-		data() {
-			let that = this;
-			return {
-				//属性是否打开
-				coupon: {
-					'coupon': false,
-					list: [],
-				},
-				attrTxt: '请选择', //属性页面提示
-				attrValue: '', //已选属性
-				animated: false, //购物车动画
-				id: 0, //商品id
-				replyCount: 0, //总评论数量
-				reply: [], //评论列表
-				storeInfo: {}, //商品详情
-				productValue: [], //系统属性
-				couponList: [], //优惠券
-				cart_num: 1, //购买数量
-				isAuto: false, //没有授权的不会自动授权
-				isShowAuth: false, //是否隐藏授权
-				isOpen: false, //是否打开属性组件
-				actionSheetHidden: true,
-				posterImageStatus: false,
-				storeImage: '', //海报产品图
-				PromotionCode: '', //二维码图片
-				canvasStatus: false, //海报绘图标签
-				posterImage: '', //海报路径
-				posterbackgd: '/static/images/posterbackgd.png',
-				sharePacket: {
-					isState: true, //默认不显示
-				}, //分销商详细
-				uid: 0, //用户uid
-				circular: false,
-				autoplay: false,
-				interval: 3000,
-				duration: 500,
-				clientHeight: "",
-				systemStore: {}, //门店信息
-				good_list: [],
-				replyChance: 0,
-				CartCount: 0,
-				isDown: true,
-				posters: false,
-				weixinStatus: false,
-				attr: {
-					cartAttr: false,
-					productAttr: [],
-					productSelect: {}
-				},
-				description: '',
-				navActive: 0,
-				H5ShareBox: false, //公众号分享图片
-				activity: [],
-				retunTop:true, //顶部返回
-				navH: "",
-				navList: [],
-				opacity: 0,
-				scrollY: 0,
-				topArr: [],
-				toView: '',
-				height: 0,
-				heightArr: [],
-				lock: false,
-				scrollTop:0,
-				tagStyle: {
-					img: 'width:100%;'
-				},
-				sliderImage:[]
-			};
-		},
-		computed: mapGetters(['isLogin']),
-		onLoad(options) {
-			let that = this
-			var pages = getCurrentPages();
-			if (pages.length <= 1) {
-				that.retunTop = false
-			}
-			// #ifdef MP
-			this.navH = app.globalData.navHeight;
-			// #endif
-			// #ifndef MP
-			this.navH = 96;
-			// #endif
-			this.id = options.id;
-			uni.getSystemInfo({
-				success: function(res) {
-					that.height = res.windowHeight
-					//res.windowHeight:获取整个窗口高度为px，*2为rpx；98为头部占据的高度；
-				},
-			});
-			//扫码携带参数处理
-			// #ifdef MP
-			if (options.scene) {
-				let value = this.$util.getUrlParams(decodeURIComponent(options.scene));
-				if (value.id) options.id = value.id;
-				//记录推广人uid
-				if (value.pid) app.globalData.spid = value.pid;
-			}
-			if (!options.id){
-				return this.$util.Tips({
-					title: '缺少参数无法查看商品'
-				}, {
-					tab: 3,
-					url: 1
-				});
-			}else{
-				this.id = options.id
-			}
-			//记录推广人uid
-			if (options.spid) app.globalData.spid = options.spid;
-			// #endif
-			this.getGoodsDetails();
-			this.getCouponList();
-			//#ifdef H5
-			this.isLogin && silenceBindingSpread();
-			//#endif
-			this.getProductReplyList();
-			this.getProductReplyCount();
-		},
-		onReady(){
-		},
-		show(){
-			console.log('222')
-		},
-		/**
-		 * 用户点击右上角分享
-		 */
-		// #ifdef MP
-		onShareAppMessage: function() {
-			let that = this;
-			that.$set(that, 'actionSheetHidden', !that.actionSheetHidden);
-			userShare();
-			return {
-				title: that.storeInfo.store_name || '',
-				imageUrl: that.storeInfo.image || '',
-				path: '/pages/goods_details/index?id=' + that.id + '&spid=' + that.uid,
-			}
-		},
-		// #endif
-		methods: {
-			closeChange:function(){
-				this.$set(this.sharePacket,'isState',true);
-			},
-			goActivity: function(e) {
-				console.log(e);
-				let item = e;
-				if (item.type === "1") {
-					uni.navigateTo({
-						url: `/pages/activity/goods_seckill_details/index?id=${item.id}&time=${item.time}&status=1`
-					});
-				} else if (item.type === "2") {
-					uni.navigateTo({
-						url: `/pages/activity/goods_bargain_details/index?id=${item.id}&bargain=${this.uid}`
-					});
-				} else {
-					uni.navigateTo({
-						url: `/pages/activity/goods_combination_details/index?id=${item.id}`
-					});
-				}
-			},
-			/**
-			 * 购物车手动填写
-			 * 
-			 */
-			iptCartNum: function(e) {
-				this.$set(this.attr.productSelect, 'cart_num', e);
-			},
-			// 后退
-			returns: function() {
-				uni.navigateBack()
-			},
-			  tap: function (index) {
-			    var id = "past"+index;
-			    var index = index;
-			    var that = this;
-			    // if (!this.data.good_list.length && id == "past2") {
-			    //   id = "past3"
-			    // }
-				this.$set(this,'toView',id);
-				this.$set(this,'navActive',index);
-				this.$set(this,'lock',true);
-				this.$set(this,'scrollTop',index>0?that.topArr[index]-(app.globalData.navHeight/2):that.topArr[index]);
-			  },
-			    scroll: function (e) {
-			      var that = this, scrollY = e.detail.scrollTop;
-			      var opacity = scrollY / 200;
-			      opacity = opacity > 1 ? 1 : opacity;
-				  that.$set(that,'opacity',opacity);
-				  that.$set(that,'scrollY',scrollY);
-			      if (that.lock) {
-					  that.$set(that,'lock',false)
-			        return;
-			      }
-			      for (var i = 0; i < that.topArr.length; i++) {
-			        if (scrollY < that.topArr[i] - (app.globalData.navHeight/2) + that.heightArr[i]) {
-						that.$set(that,'navActive',i)
-			          break
-			        }
-			      }
-			    },
-			/*
-			 *去商品详情页 
-			 */
-			goDetail(item) {
-				if(!item.activity){
-					uni.redirectTo({
-						url: '/pages/goods_details/index?id=' + item.id
-					})
-					return
-				}
-				if (item.activity.length == 0) {
-					uni.redirectTo({
-						url: '/pages/goods_details/index?id=' + item.id
-					})
-					return
-				}
-				// 砍价
-				if (item.activity && item.activity.type == 2) {
-					uni.redirectTo({
-						url: `/pages/activity/goods_bargain_details/index?id=${item.activity.id}&bargain=${this.uid}`
-					})
-					return
-				}
-				// 拼团
-				if (item.activity && item.activity.type == 3) {
-					uni.redirectTo({
-						url: `/pages/activity/goods_combination_details/index?id=${item.activity.id}`
-					})
-					return
-				}
-				// 秒杀
-				if (item.activity && item.activity.type == 1) {
-					uni.redirectTo({
-						url: `/pages/activity/goods_seckill_details/index?id=${item.activity.id}&time=${item.activity.time}&status=1`
-					})
-					return
-				}
-			},
-			// 微信登录回调
-			onLoadFun: function(e) {
-				this.getCouponList();
-				this.getCartCount();
-				this.downloadFilePromotionCode();
-				// this.getUserInfo();
-
-				// this.get_product_collect();
-			},
-			ChangCouponsClone: function() {
-				this.$set(this.coupon, 'coupon', false)
-			},
-			/*
-			 * 获取用户信息
-			 */
-			getUserInfo: function() {
-				let that = this;
-				getUserInfo().then(res => {
-					that.$set(that.sharePacket, 'isState', that.sharePacket.priceName != 0 ? false : true);
-					that.$set(that, 'uid', res.data.uid);
-				});
-			},
-			/**
-			 * 购物车数量加和数量减
-			 * 
-			 */
-			ChangeCartNum: function(changeValue) {
-				//changeValue:是否 加|减
-				//获取当前变动属性
-				let productSelect = this.productValue[this.attrValue];
-				//如果没有属性,赋值给商品默认库存
-				if (productSelect === undefined && !this.attr.productAttr.length)
-					productSelect = this.attr.productSelect;
-				//无属性值即库存为0；不存在加减；
-				if (productSelect === undefined) return;
-				let stock = productSelect.stock || 0;
-				let num = this.attr.productSelect;
-				if (changeValue) {
-					num.cart_num++;
-					if (num.cart_num > stock) {
-						this.$set(this.attr.productSelect, "cart_num", stock);
-						this.$set(this, "cart_num", stock);
-					}
-				} else {
-					num.cart_num--;
-					if (num.cart_num < 1) {
-						this.$set(this.attr.productSelect, "cart_num", 1);
-						this.$set(this, "cart_num", 1);
-					}
-				}
-			},
-			attrVal(val) {
-				this.$set(this.attr.productAttr[val.indexw], 'index', this.attr.productAttr[val.indexw].attrValues[val.indexn]);
-			},
-			/**
-			 * 属性变动赋值
-			 * 
-			 */
-			ChangeAttr: function(res) {
-				let productSelect = this.productValue[res];
-				if (productSelect && productSelect.stock > 0) {
-					this.$set(this.attr.productSelect, "image", productSelect.image);
-					this.$set(this.attr.productSelect, "price", productSelect.price);
-					this.$set(this.attr.productSelect, "stock", productSelect.stock);
-					this.$set(this.attr.productSelect, "unique", productSelect.id);
-					this.$set(this.attr.productSelect, "cart_num", 1);
-					this.$set(this, "attrValue", res);
-					this.$set(this, "attrTxt", "已选择");
-				} else {
-					this.$set(this.attr.productSelect, "image", this.storeInfo.image);
-					this.$set(this.attr.productSelect, "price", this.storeInfo.price);
-					this.$set(this.attr.productSelect, "stock", 0);
-					this.$set(this.attr.productSelect, "unique", this.storeInfo.id);
-					this.$set(this.attr.productSelect, "cart_num", 0);
-					this.$set(this, "attrValue", "");
-					this.$set(this, "attrTxt", "请选择");
-				}
-			},
-			/**
-			 * 领取完毕移除当前页面领取过的优惠券展示
-			 */
-			ChangCoupons: function(e) {
-				let coupon = e;
-				let couponList = this.$util.ArrayRemove(this.couponList, 'id', coupon.id);
-				this.$set(this, 'couponList', couponList);
-				this.getCouponList();
-			},
-
-			setClientHeight: function() {
-				let that = this;
-				if (!that.good_list.length) return;
-				let view = uni.createSelectorQuery().in(this).select("#list0");
-				view.fields({
-					size: true,
-				}, data => {
-					that.$set(that,'clientHeight',data.height + 20)
-				}).exec();
-			},
-			/**
-			 * 获取产品详情
-			 * 
-			 */
-			getGoodsDetails: function() {
-				let that = this;
-				getProductDetail(that.id).then(res => {
-					let storeInfo = res.data.storeInfo;
-					let good_list = res.data.goodList || [];
-					let count = Math.ceil(good_list.length / 6);
-					let goodArray = new Array();
-					for (let i = 0; i < count; i++) {
-						let list = good_list.slice(i * 6, i * 6 + 6);
-						if (list.length) goodArray.push({
-							list: list
-						});
-					}
-					// 字符串数组转数组；
-					let sliderImage =  eval('(' + storeInfo.sliderImage + ')');
-					that.$set(that, 'sliderImage', sliderImage);
-					that.$set(that, 'storeInfo', storeInfo);
-					that.$set(that, 'description', storeInfo.content);
-					// that.$set(that, 'reply', res.data.reply ? [res.data.reply] : []);
-					// that.$set(that, 'replyCount', res.data.replyCount);
-					// that.$set(that, 'replyChance', res.data.replyChance);
-					that.$set(that.attr, 'productAttr', res.data.productAttr);
-					that.$set(that, 'productValue', res.data.productValue);
-					that.$set(that.sharePacket, 'priceName', res.data.priceName);
-					that.$set(that, 'systemStore', res.data.system_store);
-					that.$set(that, 'good_list', goodArray);
-					that.$set(that, 'PromotionCode', storeInfo.codePath);
-					that.$set(that, 'activity', res.data.activity ? res.data.activity : []);
-					uni.setNavigationBarTitle({
-						title: storeInfo.storeName.substring(0, 7) + "..."
-					})
-					 var navList = ['商品', '评价', '详情'];
-					      if (goodArray.length) {
-					        navList.splice(2, 0, '推荐')
-					      }
-						  that.$set(that,'navList',navList);
-					// #ifdef H5
-					that.$set(that, 'storeImage', that.storeInfo.image);
-					that.getImageBase64();
-					if (that.isLogin) {
-						that.getCartCount();
-					};
-					this.ShareInfo();
-					// #endif
-					if (that.isLogin) {
-						that.getUserInfo();
-					};
-					this.$nextTick(() => {
-						if (good_list.length) {
-							that.setClientHeight();
-						};
-					})
-					setTimeout(function () {
-					       that.infoScroll();
-					     }, 500);
-					// #ifndef H5
-					that.downloadFilestoreImage();
-					// #endif
-					that.DefaultSelect();
-				}).catch(err => {
-					//状态异常返回上级页面
-					return that.$util.Tips({
-						title: err.toString()
-					}, {
-						tab: 3,
-						url: 1
-					});
-				})
-			},
-			getProductReplyList:function(){
-				getReplyList(this.id,{
-					page: 1,
-					limit: 3,
-					type: 0,
-				}).then(res=>{
-					this.reply = res.data.list;
-				})
-			},
-			getProductReplyCount: function() {
-				let that = this;
-				getReplyConfig(that.id).then(res => {
-					that.$set(that,'replyChance',res.data.replyChance*100);
-					that.$set(that,'replyCount',res.data.sumCount);
-				});
-			},
-			  infoScroll: function () {
-			    var that = this, topArr = [], heightArr = [];
-			    for (var i = 0; i < that.navList.length; i++) { //productList
-			      //获取元素所在位置
-			      var query = uni.createSelectorQuery().in(this);
-			      var idView = "#past" + i;
-			      // if (!that.data.good_list.length && i == 2) {
-			      //   var idView = "#past" + 3;
-			      // }
-			      query.select(idView).boundingClientRect();
-			      query.exec(function (res) {
-			        var top = res[0].top;
-			        var height = res[0].height;
-			        topArr.push(top);
-			        heightArr.push(height);
-					that.$set(that,'topArr',topArr);
-					that.$set(that,'heightArr',heightArr);
-			      });
-			    };
-			  },
-			/**
-			 * 拨打电话
-			 */
-			makePhone: function() {
-				uni.makePhoneCall({
-					phoneNumber: this.systemStore.phone
-				})
-			},
-			/**
-			 * 打开地图
-			 * 
-			 */
-			showMaoLocation: function() {
-				if (!this.systemStore.latitude || !this.systemStore.longitude) return this.$util.Tips({
-					title: '缺少经纬度信息无法查看地图！'
-				});
-				uni.openLocation({
-					latitude: parseFloat(this.systemStore.latitude),
-					longitude: parseFloat(this.systemStore.longitude),
-					scale: 8,
-					name: this.systemStore.name,
-					address: this.systemStore.address + this.systemStore.detailed_address,
-					success: function() {},
-				});
-			},
-			/**
-			 * 默认选中属性
-			 * 
-			 */
-			DefaultSelect: function() {
-				let productAttr = this.attr.productAttr;
-				let value = [];
-				for (let key in this.productValue) {
-					if (this.productValue[key].stock > 0) {
-						value = this.attr.productAttr.length ? key.split(",") : [];
-						break;
-					}
-				}
-				for (let i = 0; i < productAttr.length; i++) {
-					this.$set(productAttr[i], "index", value[i]);
-				}
-				//sort();排序函数:数字-英文-汉字；
-				let productSelect = this.productValue[value.sort().join(",")];
-				if (productSelect && productAttr.length) {
-					this.$set(
-						this.attr.productSelect,
-						"storeName",
-						this.storeInfo.storeName
-					);
-					this.$set(this.attr.productSelect, "image", productSelect.image);
-					this.$set(this.attr.productSelect, "price", productSelect.price);
-					this.$set(this.attr.productSelect, "stock", productSelect.stock);
-					this.$set(this.attr.productSelect, "unique", productSelect.id);
-					this.$set(this.attr.productSelect, "cart_num", 1);
-					this.$set(this, "attrValue", value.sort().join(","));
-					this.$set(this, "attrTxt", "已选择");
-				} else if (!productSelect && productAttr.length) {
-					this.$set(
-						this.attr.productSelect,
-						"storeName",
-						this.storeInfo.storeName
-					);
-					this.$set(this.attr.productSelect, "image", this.storeInfo.image);
-					this.$set(this.attr.productSelect, "price", this.storeInfo.price);
-					this.$set(this.attr.productSelect, "stock", 0);
-					this.$set(this.attr.productSelect, "unique", this.storeInfo.id);
-					this.$set(this.attr.productSelect, "cart_num", 0);
-					this.$set(this, "attrValue", "");
-					this.$set(this, "attrTxt", "请选择");
-				} else if (!productSelect && !productAttr.length) {
-					this.$set(
-						this.attr.productSelect,
-						"storeName",
-						this.storeInfo.storeName
-					);
-					this.$set(this.attr.productSelect, "image", this.storeInfo.image);
-					this.$set(this.attr.productSelect, "price", this.storeInfo.price);
-					this.$set(this.attr.productSelect, "stock", this.storeInfo.stock);
-					this.$set(
-						this.attr.productSelect,
-						"unique",
-						this.storeInfo.id || ""
-					);
-					this.$set(this.attr.productSelect, "cart_num", 1);
-					this.$set(this, "attrValue", "");
-					this.$set(this, "attrTxt", "请选择");
-				}
-			},
-			/**
-			 * 获取优惠券
-			 * 
-			 */
-			getCouponList() {
-				let that = this;
-				getCoupons({
-					page: 1,
-					limit: 40,
-					type: 1,
-					product_id: that.id
-				}).then(res => {
-					that.$set(that.coupon, 'list', res.data);
-					let couponList = [];
-					for (let i = 0; i < that.coupon.list.length; i++) {
-						if (!res.data[i].is_use && couponList.length < 2) couponList.push(res.data[i]);
-					}
-					that.$set(that, 'couponList', couponList);
-				});
-			},
-			ChangCouponsUseState(index) {
-				let that = this;
-				that.coupon.list[index].is_use = true;
-				that.$set(that.coupon, 'list', that.coupon.list);
-				that.$set(that.coupon, 'coupon', false);
-			},
-			/** 
-			 * 
-			 * 
-			 * 收藏商品
-			 */
-			setCollect: function() {
-				let that = this;
-				if (this.isLogin === false) {
-					// #ifdef H5 || APP-PLUS
-					toLogin();
-					// #endif 
-					// #ifdef MP
-					this.isAuto = true;
-					this.$set(this, 'isShowAuth', true)
-					// #endif
-				} else {
-					if (this.storeInfo.userCollect) {
-						collectDel(this.storeInfo.id).then(res => {
-							that.$set(that.storeInfo, 'userCollect', !that.storeInfo.userCollect);
-						})
-					} else {
-						collectAdd(this.storeInfo.id).then(res => {
-							that.$set(that.storeInfo, 'userCollect', !that.storeInfo.userCollect);
-						})
-					}
-				}
-			},
-			/**
-			 * 打开属性插件
-			 */
-			selecAttr: function() {
-				this.$set(this.attr, 'cartAttr', true);
-				this.$set(this, 'isOpen', true);
-			},
-			/**
-			 * 打开优惠券插件
-			 */
-			couponTap: function() {
-				let that = this;
-				if (that.isLogin === false) {
-					// #ifdef H5 || APP-PLUS
-					toLogin();
-					// #endif
-					// #ifdef MP
-					that.$set(that, 'isAuto', true);
-					that.$set(that, 'isShowAuth', true);
-					// #endif
-				} else {
-					that.getCouponList();
-					that.$set(that.coupon, 'coupon', true);
-				}
-			},
-			onMyEvent: function() {
-				this.$set(this.attr, 'cartAttr', false);
-				this.$set(this, 'isOpen', false);
-			},
-			/**
-			 * 打开属性加入购物车
-			 * 
-			 */
-			joinCart: function(e) {
-				//是否登录
-				if (this.isLogin === false) {
-					// #ifdef H5 || APP-PLUS
-					toLogin();
-					// #endif
-					// #ifdef MP
-					this.$set(this, 'isAuto', true);
-					this.$set(this, 'isShowAuth', true)
-					// #endif
-				} else {
-					this.goCat();
-				}
-			},
-			/*
-			 * 加入购物车
-			 */
-			goCat: function(news) {
-
-				let that = this,
-					productSelect = that.productValue[this.attrValue];
-				//打开属性
-				if (that.attrValue) {
-					//默认选中了属性，但是没有打开过属性弹窗还是自动打开让用户查看默认选中的属性
-					that.attr.cartAttr = !that.isOpen ? true : false;
-				} else {
-					if (that.isOpen) that.attr.cartAttr = true;
-					else that.attr.cartAttr = !that.attr.cartAttr;
-				}
-				//只有关闭属性弹窗时进行加入购物车
-				if (that.attr.cartAttr === true && that.isOpen === false)
-					return (that.isOpen = true);
-				//如果有属性,没有选择,提示用户选择
-				if (
-					that.attr.productAttr.length &&
-					productSelect === undefined &&
-					that.isOpen === true
-				)
-					return that.$util.Tips({
-						title: "产品库存不足，请选择其它"
-					});
-					
-				let q = {
-					productId: Number(that.id),
-					cartNum: Number(that.attr.productSelect.cart_num),
-					isNew : news === undefined ? false : true,
-					productAttrUnique : that.attr.productSelect !== undefined ?
-						that.attr.productSelect.unique : that.storeInfo.id
-				};
-				postCartAdd(q)
-					.then(function(res) {
-						that.isOpen = false;
-						that.attr.cartAttr = false;
-						if (news) {
-							uni.navigateTo({
-								url: '/pages/users/order_confirm/index?new=true&cartId=' + res.data.cartId
-							});
-						} else {
-							that.$util.Tips({
-								title: "添加购物车成功",
-								success: () => {
-									that.getCartCount(true);
-								}
-							});
-						}
-					})
-					.catch(res => {
-						that.isOpen = false;
-						return that.$util.Tips({
-							title: res
-						});
-					});
-			},
-			/**
-			 * 获取购物车数量
-			 * @param boolean 是否展示购物车动画和重置属性
-			 */
-			getCartCount: function(isAnima) {
-				let that = this;
-				const isLogin = that.isLogin;
-				if (isLogin) {
-					getCartCounts().then(res => {
-						that.CartCount = res.data.count;
-						//加入购物车后重置属性
-						if (isAnima) {
-							that.animated = true;
-							setTimeout(function() {
-								that.animated = false;
-							}, 500);
-						}
-					});
-				}
-			},
-			/**
-			 * 立即购买
-			 */
-			goBuy: function(e) {
-				if (this.isLogin === false) {
-					// #ifdef H5 || APP-PLUS
-					toLogin();
-					// #endif
-					// #ifdef MP
-					this.$set(this, 'isAuto', true);
-					this.$set(this, 'isShowAuth', true);
-					// #endif
-				} else {
-					this.goCat(true);
-				}
-			},
-			// 授权关闭
-			authColse: function(e) {
-				console.log(e, 'eeeee')
-				this.isShowAuth = e
-			},
-			/**
-			 * 分享打开
-			 * 
-			 */
-			listenerActionSheet: function() {
-				if (this.isLogin === false) {
-					// #ifdef H5 || APP-PLUS
-					toLogin();
-					// #endif
-					// #ifdef MP
-					this.$set(this, 'isAuto', true);
-					this.$set(this, 'isShowAuth', true);
-					// #endif
-				} else {
-					// #ifdef H5
-					if (this.$wechat.isWeixin() === true) {
-						this.weixinStatus = true;
-					}
-					this.downloadFilePromotionCode();
-					// #endif
-					this.posters = true;
-
-				}
-			},
-			// 分享关闭
-			listenerActionClose: function() {
-				this.posters = false;
-			},
-			//隐藏海报
-			posterImageClose: function() {
-				this.posterImageStatus = false
-			},
-			//替换安全域名
-			setDomain: function(url) {
-				url = url ? url.toString() : '';
-				//本地调试打开,生产请注销
-				if (url.indexOf("https://") > -1) return url;
-				else return url.replace('http://', 'https://');
-			},
-			//获取海报产品图
-			downloadFilestoreImage: function() {
-				let that = this;
-				uni.downloadFile({
-					url: that.setDomain(that.storeInfo.image),
-					success: function(res) {
-						that.storeImage = res.tempFilePath;
-					},
-					fail: function() {
-						return that.$util.Tips({
-							title: ''
-						});
-						that.storeImage = '';
-					},
-				});
-			},
-			/**
-			 * 获取产品分销二维码
-			 * @param function successFn 下载完成回调
-			 * 
-			 */
-			downloadFilePromotionCode: function(successFn) {
-				let that = this;
-				getProductCode(that.id).then(res => {
-					uni.downloadFile({
-						url: that.setDomain(res.data.code),
-						success: function(res) {
-							that.$set(that, 'isDown', false);
-							if (typeof successFn == 'function')
-								successFn && successFn(res.tempFilePath);
-							else
-								that.$set(that, 'PromotionCode', res.tempFilePath);
-						},
-						fail: function() {
-							that.$set(that, 'isDown', false);
-							that.$set(that, 'PromotionCode', '');
-						},
-					});
-				}).catch(err => {
-					that.$set(that, 'isDown', false);
-					that.$set(that, 'PromotionCode', '');
-				});
-			},
-			getImageBase64: function() {
-				let that = this;
-				imageBase64(that.storeImage, that.PromotionCode)
-					.then(res => {
-						that.storeImage = res.data.image;
-						that.PromotionCode = res.data.code;
-					})
-					.catch(() => {});
-			},
-			// 小程序关闭分享弹窗；
-			goFriend: function() {
-				this.posters = false;
-			},
-			/**
-			 * 生成海报
-			 */
-			goPoster: function() {
-				console.log(4545454);
-				let that = this;
-				that.posters = false;
-				that.$set(that, 'canvasStatus', true);
-				let arr2 = [that.posterbackgd, that.storeImage, that.PromotionCode];
-				if (that.isDown) return that.$util.Tips({
-					title: '正在下载海报,请稍后再试！'
-				});
-				uni.getImageInfo({
-					src: that.PromotionCode,
-					fail: function(res) {
-						// #ifdef H5
-						return that.$util.Tips({
-							title: res
-						});
-						// #endif
-						// #ifdef MP
-						return that.$util.Tips({
-							title: '小程序二维码需要发布正式版后才能获取到'
-						});
-						// #endif
-					},
-					success() {
-						if (arr2[2] == '') {
-							//海报二维码不存在则从新下载
-							that.downloadFilePromotionCode(function(msgPromotionCode) {
-								arr2[2] = msgPromotionCode;
-								if (arr2[2] == '')
-									return that.$util.Tips({
-										title: '海报二维码生成失败！'
-									});
-								that.$util.PosterCanvas(arr2, that.storeInfo.storeName, that.storeInfo.price, function(tempFilePath) {
-									that.$set(that, 'posterImage', tempFilePath);
-									that.$set(that, 'posterImageStatus', true);
-									that.$set(that, 'canvasStatus', false);
-									that.$set(that, 'actionSheetHidden', !that.actionSheetHidden);
-								});
-							});
-						} else {
-							//生成推广海报
-							that.$util.PosterCanvas(arr2, that.storeInfo.store_name, that.storeInfo.price, function(tempFilePath) {
-								that.$set(that, 'posterImage', tempFilePath);
-								that.$set(that, 'posterImageStatus', true);
-								that.$set(that, 'canvasStatus', false);
-								that.$set(that, 'actionSheetHidden', !that.actionSheetHidden);
-							});
-						}
-					},
-				});
-			},
-
-			/*
-			 * 保存到手机相册
-			 */
-			// #ifdef MP
-			savePosterPath: function() {
-				let that = this;
-				uni.getSetting({
-					success(res) {
-						if (!res.authSetting['scope.writePhotosAlbum']) {
-							uni.authorize({
-								scope: 'scope.writePhotosAlbum',
-								success() {
-									uni.saveImageToPhotosAlbum({
-										filePath: that.posterImage,
-										success: function(res) {
-											that.posterImageClose();
-											that.$util.Tips({
-												title: '保存成功',
-												icon: 'success'
-											});
-										},
-										fail: function(res) {
-											that.$util.Tips({
-												title: '保存失败'
-											});
-										}
-									})
-								}
-							})
-						} else {
-							uni.saveImageToPhotosAlbum({
-								filePath: that.posterImage,
-								success: function(res) {
-									that.posterImageClose();
-									that.$util.Tips({
-										title: '保存成功',
-										icon: 'success'
-									});
-								},
-								fail: function(res) {
-									that.$util.Tips({
-										title: '保存失败'
-									});
-								},
-							})
-						}
-					}
-				})
-			},
-			// #endif
-			//#ifdef H5
-			ShareInfo() {
-				let data = this.storeInfo;
-				let href = location.href;
-				console.log(data);
-				if (this.$wechat.isWeixin()) {
-					getUserInfo().then(res => {
-						href =
-							href.indexOf("?") === -1 ?
-							href + "?spread=" + res.data.uid :
-							href + "&spread=" + res.data.uid;
-
-						let configAppMessage = {
-							desc: data.store_info,
-							title: data.store_name,
-							link: href,
-							imgUrl: data.image
-						};
-						this.$wechat.wechatEvevt([
-							"updateAppMessageShareData",
-							"updateTimelineShareData",
-							"onMenuShareAppMessage",
-							"onMenuShareTimeline"
-						], configAppMessage).then(res => {
-							console.log(res);
-						}).catch(err => {
-							console.log(err);
-						})
-					});
-				}
-			},
-			//#endif
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	.activity_pin {
-		width: auto;
-		height: 44rpx;
-		line-height: 44rpx;
-		background: linear-gradient(90deg, rgba(233, 51, 35, 1) 0%, rgba(250, 101, 20, 1) 100%);
-		opacity: 1;
-		border-radius: 22rpx;
-		padding: 0 15rpx;
-		margin-left: 19rpx;
-	}
-
-	.activity_miao {
-		width: auto;
-		height: 44rpx;
-		line-height: 44rpx;
-		padding: 0 15rpx;
-		background: linear-gradient(90deg, rgba(250, 102, 24, 1) 0%, rgba(254, 161, 15, 1) 100%);
-		opacity: 1;
-		border-radius: 22rpx;
-		margin-left: 19rpx;
-	}
-
-	.iconfonts {
-		color: #fff !important;
-		font-size: 28rpx;
-	}
-
-	.activity_title {
-		font-size: 24rpx;
-		color: #fff;
-	}
-
-	.activity_kan {
-		width: auto;
-		height: 44rpx;
-		line-height: 44rpx;
-		padding: 0 15rpx;
-		background: linear-gradient(90deg, rgba(254, 159, 15, 1) 0%, rgba(254, 178, 15, 1) 100%);
-		opacity: 1;
-		border-radius: 22rpx;
-		margin-left: 19rpx;
-	}
-
-	.mask {
-		z-index: 300 !important;
-	}
-
-	.head-bar {
-		background: #fff;
-	}
-
-	.generate-posters {
-		width: 100%;
-		height: 170rpx;
-		background-color: #fff;
-		position: fixed;
-		left: 0;
-		bottom: 0;
-		z-index: 388;
-		transform: translate3d(0, 100%, 0);
-		transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
-		border-top: 1rpx solid #eee;
-	}
-
-	.generate-posters.on {
-		transform: translate3d(0, 0, 0);
-	}
-
-	.generate-posters .item {
-		flex: 50%;
-		text-align: center;
-		font-size: 30rpx;
-	}
-
-	.generate-posters .item .iconfont {
-		font-size: 80rpx;
-		color: #5eae72;
-	}
-
-	.generate-posters .item .iconfont.icon-haibao {
-		color: #5391f1;
-	}
-
-	.product-con .mask {
-		z-index: 88;
-	}
-
-	.product-con .footer {
-		padding: 0 20rpx 0 30rpx;
-		position: fixed;
-		bottom: 0;
-		width: 100%;
-		box-sizing: border-box;
-		height: 100rpx;
-		background-color: #fff;
-		z-index: 277;
-		border-top: 1rpx solid #f0f0f0;
-	}
-
-	.product-con .footer .item {
-		font-size: 18rpx;
-		color: #666;
-	}
-
-	.product-con .footer .item .iconfont {
-		text-align: center;
-		font-size: 40rpx;
-	}
-
-	.product-con .footer .item .iconfont.icon-shoucang1 {
-		color: #f00;
-	}
-
-	.product-con .footer .item .iconfont.icon-gouwuche1 {
-		font-size: 40rpx;
-		position: relative;
-	}
-
-	.product-con .footer .item .iconfont.icon-gouwuche1 .num {
-		color: #fff;
-		position: absolute;
-		font-size: 18rpx;
-		padding: 2rpx 8rpx 3rpx;
-		border-radius: 200rpx;
-		top: -10rpx;
-		right: -10rpx;
-	}
-
-	.product-con .footer .bnt {
-		width: 444rpx;
-		height: 76rpx;
-	}
-
-	.product-con .footer .bnt .bnts {
-		width: 222rpx;
-		text-align: center;
-		line-height: 76rpx;
-		color: #fff;
-		font-size: 28rpx;
-	}
-
-	.product-con .footer .bnt .joinCart {
-		border-radius: 50rpx 0 0 50rpx;
-		background-image: linear-gradient(to right, #fea10f 0%, #fa8013 100%);
-	}
-
-	.product-con .footer .bnt .buy {
-		border-radius: 0 50rpx 50rpx 0;
-		background-image: linear-gradient(to right, #fa6514 0%, #e93323 100%);
-	}
-
-	.product-con .store-info {
-		margin-top: 20rpx;
-		background-color: #fff;
-	}
-
-	.product-con .store-info .title {
-		padding: 0 30rpx;
-		font-size: 28rpx;
-		color: #282828;
-		height: 80rpx;
-		line-height: 80rpx;
-		border-bottom: 1px solid #f5f5f5;
-	}
-
-	.product-con .store-info .info {
-		padding: 0 30rpx;
-		height: 126rpx;
-	}
-
-	.product-con .store-info .info .picTxt {
-		width: 615rpx;
-	}
-
-	.product-con .store-info .info .picTxt .pictrue {
-		width: 76rpx;
-		height: 76rpx;
-	}
-
-	.product-con .store-info .info .picTxt .pictrue image {
-		width: 100%;
-		height: 100%;
-		border-radius: 6rpx;
-	}
-
-	.product-con .store-info .info .picTxt .text {
-		width: 522rpx;
-	}
-
-	.product-con .store-info .info .picTxt .text .name {
-		font-size: 30rpx;
-		color: #282828;
-	}
-
-	.product-con .store-info .info .picTxt .text .address {
-		font-size: 24rpx;
-		color: #666;
-		margin-top: 3rpx;
-	}
-
-	.product-con .store-info .info .picTxt .text .address .iconfont {
-		color: #707070;
-		font-size: 18rpx;
-		margin-left: 10rpx;
-	}
-
-	.product-con .store-info .info .picTxt .text .address .addressTxt {
-		max-width: 480rpx;
-	}
-
-	.product-con .store-info .info .iconfont {
-		font-size: 40rpx;
-	}
-
-	.product-con .superior {
-		background-color: #fff;
-		margin-top: 20rpx;
-		padding-bottom: 10rpx;
-	}
-
-	.product-con .superior .title {
-		height: 98rpx;
-	}
-
-	.product-con .superior .title image {
-		width: 30rpx;
-		height: 30rpx;
-	}
-
-	.product-con .superior .title .titleTxt {
-		margin: 0 20rpx;
-		font-size: 30rpx;
-		background-image: linear-gradient(to right, #f57a37 0%, #f21b07 100%);
-		-webkit-background-clip: text;
-		-webkit-text-fill-color: transparent;
-	}
-
-	.product-con .superior .slider-banner {
-		width: 690rpx;
-		margin: 0 auto;
-		position: relative;
-	}
-
-	.product-con .superior .slider-banner swiper {
-		height: 100%;
-		width: 100%;
-	}
-
-	.product-con .superior .slider-banner swiper-item {
-		height: 100%;
-	}
-
-	.product-con .superior .slider-banner .list {
-		width: 100%;
-	}
-
-	.product-con .superior .slider-banner .list .item {
-		width: 215rpx;
-		margin: 0 22rpx 30rpx 0;
-		font-size: 26rpx;
-	}
-
-	.product-con .superior .slider-banner .list .item:nth-of-type(3n) {
-		margin-right: 0;
-	}
-
-	.product-con .superior .slider-banner .list .item .pictrue {
-		position: relative;
-		width: 100%;
-		height: 215rpx;
-	}
-
-	.product-con .superior .slider-banner .list .item .pictrue image {
-		width: 100%;
-		height: 100%;
-		border-radius: 6rpx;
-	}
-
-	.product-con .superior .slider-banner .list .item .name {
-		color: #282828;
-		margin-top: 12rpx;
-	}
-
-	.product-con .superior .slider-banner .swiper-pagination-bullet {
-		background-color: #999;
-	}
-
-	.product-con .superior .slider-banner .swiper-pagination-bullet-active {
-		background-color: #e93323;
-	}
-
-	button {
-		padding: 0;
-		margin: 0;
-		line-height: normal;
-		background-color: #fff;
-	}
-
-	button::after {
-		border: 0;
-	}
-
-	action-sheet-item {
-		padding: 0;
-		height: 240rpx;
-		align-items: center;
-		display: flex;
-	}
-
-	.contact {
-		font-size: 16px;
-		width: 50%;
-		background-color: #fff;
-		padding: 8rpx 0;
-		border-radius: 0;
-		margin: 0;
-		line-height: 2;
-	}
-
-	.contact::after {
-		border: none;
-	}
-
-	.action-sheet {
-		font-size: 17px;
-		line-height: 1.8;
-		width: 50%;
-		position: absolute;
-		top: 0;
-		right: 0;
-		padding: 25rpx 0;
-	}
-
-	.canvas {
-		z-index: 300;
-		width: 750px;
-		height: 1190px;
-	}
-
-	.poster-pop {
-		width: 450rpx;
-		height: 714rpx;
-		position: fixed;
-		left: 50%;
-		transform: translateX(-50%);
-		z-index: 399;
-		top: 50%;
-		margin-top: -357rpx;
-	}
-
-	.poster-pop image {
-		width: 100%;
-		height: 100%;
-		display: block;
-	}
-
-	.poster-pop .close {
-		width: 46rpx;
-		height: 75rpx;
-		position: fixed;
-		right: 0;
-		top: -73rpx;
-		display: block;
-	}
-
-	.poster-pop .save-poster {
-		background-color: #df2d0a;
-		font-size: ：22rpx;
-		color: #fff;
-		text-align: center;
-		height: 76rpx;
-		line-height: 76rpx;
-		width: 100%;
-	}
-
-	.poster-pop .keep {
-		color: #fff;
-		text-align: center;
-		font-size: 25rpx;
-		margin-top: 10rpx;
-	}
-
-	.mask {
-		position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		background-color: rgba(0, 0, 0, 0.6);
-		z-index: 9;
-	}
-
-	.pro-wrapper .iconn {
-		background-image: url('data:image/png;base64,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');
-		width: 100rpx;
-		height: 100rpx;
-		background-repeat: no-repeat;
-		background-size: 100% 100%;
-		margin: 0 auto;
-	}
-
-	.pro-wrapper .iconn.iconn1 {
-		background-image: url('data:image/png;base64,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');
-	}
-
-	.pictrue_log {
-		width: 80upx;
-		height: 40upx;
-		border-radius: 6upx 0 12upx 0;
-		line-height: 40upx;
-		font-size: 24upx;
-	}
-
-	.pictrue_log_class {
-		z-index: 3;
-		background: -webkit-gradient(linear, left top, right top, from(rgba(246, 122, 56, 1)), to(rgba(241, 27, 9, 1)));
-		background: linear-gradient(90deg, rgba(246, 122, 56, 1) 0%, rgba(241, 27, 9, 1) 100%);
-		opacity: 1;
-		position: absolute;
-		top: 0;
-		left: 0;
-		color: #fff;
-		text-align: center;
-
-	}
-
-	.navbar .header {
-		height: 96rpx;
-		font-size: 30rpx;
-		color: #050505;
-		background-color: #fff;
-		/* #ifdef MP */
-		padding-right: 95rpx;
-		/* #endif */
-	}
-
-	.icon-xiangzuo {
-		/* #ifdef H5 */
-		top: 20rpx !important;
-		/* #endif */
-	}
-
-	.navbar .header .item {
-		position: relative;
-		margin: 0 25rpx;
-	}
-
-	.navbar .header .item.on:before {
-		position: absolute;
-		width: 60rpx;
-		height: 5rpx;
-		background-repeat: no-repeat;
-		content: "";
-		background-image: linear-gradient(to right, #ff3366 0%, #ff6533 100%);
-		bottom: -10rpx;
-		left: 50%;
-		margin-left: -28rpx;
-	}
-
-	.navbar {
-		position: fixed;
-		background-color: #fff;
-		top: 0;
-		left: 0;
-		z-index: 99;
-		width: 100%;
-	}
-
-	.navbar .navbarH {
-		position: relative;
-	}
-
-	.navbar .navbarH .navbarCon {
-		position: absolute;
-		bottom: 0;
-		height: 100rpx;
-		width: 100%;
-	}
-
-	.icon-xiangzuo {
-		color: #000;
-		position: fixed;
-		font-size: 36rpx;
-		width: 100rpx;
-		height: 56rpx;
-		line-height: 54rpx;
-		z-index: 1000;
-		left: 33rpx;
-	}
-
-	.share-box {
-		z-index: 1000;
-		position: fixed;
-		left: 0;
-		top: 0;
-		width: 100%;
-		height: 100%;
-
-		image {
-			width: 100%;
-			height: 100%;
-		}
-	}
-</style>
diff --git a/pages/goods_details/index003.vue b/pages/goods_details/index003.vue
deleted file mode 100644
index 1feb4e6c..00000000
--- a/pages/goods_details/index003.vue
+++ /dev/null
@@ -1,81 +0,0 @@
-<template>
-<view>
-	<view v-if="canvasStatus">
-		<view class="mask"></view>
-		<image :src='imagePath' class="canvas"></image>
-	</view>
-	<view  v-else>
-		<canvas style="width:750rpx;height:1190rpx;position: fixed;z-index: -5;" canvas-id="firstCanvas"></canvas>
-		<canvas style="position:fixed;z-index: -5;opacity: 0;" canvas-id="qrcode" :style="{width: `${qrcodeSize}px`, height: `${qrcodeSize}px`}"/>
-	</view>
-	<div @click='clickgg'>点击</div>
-</view>
-</template>
- 
-<script>
-	import uQRCode from '@/js_sdk/Sansnn-uQRCode/uqrcode.js'
-	import {
-		HTTP_REQUEST_URL
-	 } from '@/config/app.js';
-export default {
-	data(){
-		return{
-			imagePath:'',
-			canvasStatus:false,
-			
-			qrcodeText: HTTP_REQUEST_URL,
-			qrcodeSize: 129,
-			PromotionCode:''
-		}
-	},
-    onReady: function (e) {
-		this.make();
-    },
-    methods: {
-		// 生成二维码；
-		make() {
-			let that = this;
-			uQRCode.make({
-				canvasId: 'qrcode',
-				text: this.qrcodeText,
-				size: this.qrcodeSize,
-				margin: 10,
-				success: res => {
-					that.PromotionCode = res;
-				},
-				complete: () => {
-				},
-				fail:res=>{
-					that.$util.Tips({
-						title: '海报二维码生成失败！'
-					});
-				}
-			})
-		},
-		clickgg(){
-			let that = this;
-			// ../../static/images/barg002.png
-			let arrImages = ['../../static/images/posterbackgd.png','../../static/images/explosion.png',that.PromotionCode];
-			let storeName = '1十大歌手大好时光的电视广上世纪法国设计风格加工费设计规范技术规范设计规范手机话费csdsdsdsd9';
-			let price = '20';
-			that.$util.PosterCanvas(arrImages, storeName, price, function(tempFilePath) {
-				console.log('klklkl');
-				that.imagePath = tempFilePath;
-				that.canvasStatus = true;
-			});
-		}
-    }
-}
-</script>
-<style>
-	.canvas{
-		position: fixed;
-		width: 512rpx;
-		height: 864rpx;
-		top:50%;
-		left:50%;
-		margin-left: -256rpx;
-		margin-top: -432rpx;
-		z-index: 999;
-	}
-</style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 4c92ab01..7eb9e5d3 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -282,10 +282,14 @@
 	import {
 		silenceBindingSpread
 	} from '@/utils';
-	
+	// #ifdef H5
+	import {
+		kefuConfig
+	} from "@/api/public";
 	import {
 		getWechatConfig
 	} from "@/api/public";
+	// #endif
 	const arrTemp = ["paySubscribe","orderSubscribe","extrctSubscribe", "orderRefundSubscribe", "rechargeSubscribe"];
 	export default {
 		computed: mapGetters(['isLogin', 'uid']),
@@ -434,7 +438,6 @@
 						let arr = res.data.map((item) => {
 							return item.tempId
 						})
-						//console.log(arr)
 						wx.setStorageSync('tempID'+ data, arr);
 					}
 				})
@@ -627,11 +630,17 @@
 				})
 			},
 			getChatUrL() {
+				kefuConfig().then(res => {
+					let data = res.data;
+					this.$store.commit("SET_CHATURL", data.yzfUrl);
+					Cache.set('chatUrl', data.yzfUrl);
+				})
+			},
+			getMpChatUrL(){
 				getWechatConfig().then(res => {
 					let data = res.data;
 					this.$store.commit("SET_CHATURL", data.yzfUrl);
 					Cache.set('chatUrl', data.yzfUrl);
-					console.log(data)
 				})
 			},
 			// setOpenShare:function(mss){
@@ -772,7 +781,7 @@
 		mounted() {
 			let self = this
 			// #ifdef H5
-			this.getChatUrL();
+			self.$wechat.isWeixin()?self.getMpChatUrL():self.getChatUrL();
 			// 获取H5 搜索框高度
 			let appSearchH = uni.createSelectorQuery().select(".serch-wrapper");
 			appSearchH.boundingClientRect(function(data) {
diff --git a/pages/news_details/index.vue b/pages/news_details/index.vue
index b89c77c3..2def71a4 100644
--- a/pages/news_details/index.vue
+++ b/pages/news_details/index.vue
@@ -5,7 +5,7 @@
 			<view class='list acea-row row-middle'>
 				<view class='label'>{{articleInfo.categoryName}}</view>
 				<view class='item'></text>{{articleInfo.createTime}}</view>
-			<!-- 	<view class='item'><text class='iconfont icon-liulan'></text>{{articleInfo.visit}}</view> -->
+				<view class='item'><text class='iconfont icon-liulan'></text>{{articleInfo.visit}}</view>
 			</view>
 			<view class='conters'>
 				<jyf-parser :html="content" ref="article" :tag-style="tagStyle"></jyf-parser>
@@ -140,7 +140,7 @@
 	}
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 	page {
 		background-color: #fff !important;
 	}
diff --git a/pages/order_addcart/order_addcart.vue b/pages/order_addcart/order_addcart.vue
index 7dd7cd3d..09974a7f 100644
--- a/pages/order_addcart/order_addcart.vue
+++ b/pages/order_addcart/order_addcart.vue
@@ -475,7 +475,7 @@
 					let selectValueProductId = that.getSelectValueProductId();
 					collectAll(that.getSelectValueProductId()).then(res => {
 						return that.$util.Tips({
-							title: res,
+							title: '收藏成功',
 							icon: 'success'
 						});
 					}).catch(err => {
diff --git a/pages/order_addcart/order_addcart01.vue b/pages/order_addcart/order_addcart01.vue
index 370c5f01..c0e48182 100644
--- a/pages/order_addcart/order_addcart01.vue
+++ b/pages/order_addcart/order_addcart01.vue
@@ -344,11 +344,9 @@
 					this.switchSelect();
 			 },
 			 blurInput:function (index) {
-				 console.log(66);
 				 let item = this.cartList.valid[index];
 				 if(!item.cart_num){
 					 item.cart_num = 1;
-					 console.log( item.cart_num)
 					 this.$set(this.cartList,'valid',this.cartList.valid)
 				 }
 			 },
diff --git a/pages/order_addcart/order_addcart11.vue b/pages/order_addcart/order_addcart11.vue
index 68065a0a..ae1375ae 100644
--- a/pages/order_addcart/order_addcart11.vue
+++ b/pages/order_addcart/order_addcart11.vue
@@ -444,7 +444,6 @@
 			subDel: function(event) {
 				let that = this,
 					selectValue = that.selectValue;
-					console.log(that.selectValue)
 				
 				// if (selectValue.length > 0)
 				// 	cartDel(selectValue).then(res => {
@@ -478,8 +477,6 @@
 					selectValue = that.selectValue;
 				if (selectValue.length > 0) {
 					let selectValueProductId = that.getSelectValueProductId();
-					console.log('selectValueProductId');
-					console.log(selectValueProductId.join(','));
 					// collectAll(that.getSelectValueProductId()).then(res => {
 					// 	return that.$util.Tips({
 					// 		title: res.msg,
@@ -499,7 +496,6 @@
 			subOrder: function(event) {
 				let that = this,
 					selectValue = that.selectValue;
-					console.log(that.selectValue)
 				if (selectValue.length > 0) {
 					// uni.navigateTo({
 					// 	url: '/pages/users/order_confirm/index?new=false&cartId=' + selectValue.join(',')
@@ -541,13 +537,10 @@
 					}
 					that.$set(that.cartList, 'valid', valid);
 					that.selectValue = selectValue;
-					console.log('cartList', that.cartList)
-					console.log(that.selectValue)
 					that.switchSelect();
 				}
 			},
 			checkboxChange: function(event) {
-				console.log(event)
 				let that = this;
 				let value = event.detail.value;
 				let valid = that.cartList.valid;
@@ -587,8 +580,6 @@
 				let newArr = that.cartList.valid.filter(item => item.attrStatus);
 				that.isAllSelect = value.length == newArr.length;
 				that.selectValue = value
-				console.log('选中', that.selectValue)
-				console.log('啦啦啦', that.cartList.valid)
 				that.switchSelect();
 			},
 			inArray: function(search, array) {
@@ -703,7 +694,6 @@
 					let valid = res.data.list;
 					let loadend = valid.length < that.limit;
 					let validList = that.$util.SplitArray(valid, that.cartList.valid)
-					console.log(validList)
 					//console.log(that.$util.toStringValue(validList)) 
 					
 					let numSub = [{
diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue
index 9ecaceca..5ecf3040 100644
--- a/pages/order_details/index.vue
+++ b/pages/order_details/index.vue
@@ -657,14 +657,19 @@
 				totalPrice: '0',
 				isAuto: false, //没有授权的不会自动授权
 				isShowAuth: false, //是否隐藏授权
-				id: 0,//订单id
-				uniId:''
+				id: 0, //订单id
+				uniId: ''
 			};
 		},
 		computed: mapGetters(['isLogin', 'chatUrl']),
 		onLoad: function(options) {
-			if (!options.order_id && !options.uniId) return this.$util.Tips({title:'缺少参数'},{tab:3,url:1});
-			   this.$set(this, 'order_id', options.order_id);
+			if (!options.order_id && !options.uniId) return this.$util.Tips({
+				title: '缺少参数'
+			}, {
+				tab: 3,
+				url: 1
+			});
+			this.$set(this, 'order_id', options.order_id);
 		},
 		onShow() {
 			if (this.isLogin) {
@@ -696,8 +701,8 @@
 			// #endif
 		},
 		methods: {
-			kefuClick(){
-               location.href = this.chatUrl;
+			kefuClick() {
+				location.href = this.chatUrl;
 			},
 			goGoodCall() {
 				let self = this
@@ -824,8 +829,9 @@
 					that.$set(that, 'evaluate', _type == 3 ? 3 : 0);
 					that.$set(that, 'system_store', res.data.systemStore);
 					that.$set(that, 'id', res.data.id);
-					let cartInfo = res.data.cartInfo,newCartInfo = [];
-					cartInfo.forEach((item,index)=>{
+					let cartInfo = res.data.cartInfo,
+						newCartInfo = [];
+					cartInfo.forEach((item, index) => {
 						newCartInfo.push(item.info);
 					});
 					that.$set(that, 'cartInfo', newCartInfo);
@@ -847,7 +853,11 @@
 			 * 生成二维码
 			 */
 			markCode(text) {
-				qrcodeApi({ height: '145', text: text, width: '145' }).then(res => {
+				qrcodeApi({
+					height: '145',
+					text: text,
+					width: '145'
+				}).then(res => {
 					this.codeImg = res.data.code
 				});
 			},
@@ -859,7 +869,7 @@
 			copy: function() {
 				let that = this;
 				uni.setClipboardData({
-					data: this.orderInfo.order_id
+					data: this.orderInfo.orderId
 				});
 			},
 			// #endif
@@ -912,11 +922,15 @@
 			 */
 			goOrderConfirm: function() {
 				let that = this;
-				orderAgain(that.orderInfo.unique).then(res => {
+				orderAgain(that.orderInfo.orderId).then(res => {
 					return uni.navigateTo({
 						url: '/pages/users/order_confirm/index?cartId=' + res.data.cateId + '&again=true&new=true&addAgain=true'
 					});
-				});
+				}).catch(err => {
+					return that.$util.Tips({
+						title: err
+					});
+				})
 			},
 			confirmOrder: function() {
 				let that = this;
diff --git a/pages/order_pay_status/index.vue b/pages/order_pay_status/index.vue
index e6d8b314..e70ca4f3 100644
--- a/pages/order_pay_status/index.vue
+++ b/pages/order_pay_status/index.vue
@@ -3,7 +3,7 @@
 		<view class='payment-status'>
 			<!--失败时： 用icon-iconfontguanbi fail替换icon-duihao2 bg-color-->
 			<view class='iconfont icons icon-duihao2 bg-color' v-if="order_pay_info.paid || order_pay_info.payType == 'offline'"></view>
-			<view class='iconfont icons icon-iconfontguanbi bg-color' v-else></view>
+			<view class='iconfont icons icon-iconfontguanbi' v-else></view>
 			<!-- 失败时：订单支付失败 -->
 			<view class='status' v-if="order_pay_info.payType != 'offline'">{{order_pay_info.paid ? '订单支付成功':'订单支付失败'}}</view>
 			<view class='status' v-else>订单创建成功</view>
@@ -14,7 +14,7 @@
 				</view>
 				<view class='item acea-row row-between-wrapper'>
 					<view>下单时间</view>
-					<view class='itemCom'>{{order_pay_info.createTime}}</view>
+					<view class='itemCom'>{{order_pay_info.createTime?order_pay_info.createTime:'-'}}</view>
 				</view>
 				<view class='item acea-row row-between-wrapper'>
 					<view>支付方式</view>
@@ -34,7 +34,7 @@
 				</view>
 			</view>
 			<!--失败时： 重新购买 -->
-			<view @tap="goOrderDetails" v-if="status==0">
+			<view @tap="goOrderDetails">
 				<button formType="submit" class='returnBnt bg-color' hover-class='none'>查看订单</button>
 			</view>
 			<view @tap="goOrderDetails" v-if="order_pay_info.paid==0 && status==1">
@@ -179,6 +179,10 @@
 </script>
 
 <style>
+	.icon-iconfontguanbi{
+		background-color: #999 !important;
+		text-shadow: none !important;
+	}
 	.payment-status {
 		background-color: #fff;
 		margin: 195rpx 30rpx 0 30rpx;
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 13a82fab..516e4807 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -115,9 +115,7 @@
 			</button>
 			<!-- #endif -->
 		</view>
-		<!-- <view style="height: 50rpx;"></view> -->
 		<img src="/static/images/support.png" alt="" class='support'>
-
 		<!-- #ifdef MP -->
 		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
 		<!-- #endif -->
@@ -347,7 +345,6 @@
 		margin: 54rpx auto;
 		display: block;
 	}
-
 	.new-users {
 		.head {
 			padding-top: 30rpx;
diff --git a/pages/users/commission_rank/index.vue b/pages/users/commission_rank/index.vue
index e316c9bb..3785eaf6 100644
--- a/pages/users/commission_rank/index.vue
+++ b/pages/users/commission_rank/index.vue
@@ -2,7 +2,7 @@
 	<view>
 		<view class="CommissionRank">
 			<view class="header">
-				<view class="rank" v-if="position&&position<100 ">您目前的排名<text class="num">{{position}}</text>名</view>
+				<view class="rank" v-if="position">您目前的排名<text class="num">{{position}}</text>名</view>
 				<view class="rank" v-else>您目前暂无排名</view>
 			</view>
 			<view class="wrapper">
@@ -63,7 +63,7 @@
 				active: 0,
 				rankList: [],
 				page: 1,
-				limit: 10,
+				limit: 20,
 				loadend: false,
 				loading: false,
 				loadTitle: '加载更多',
@@ -104,7 +104,7 @@
 				this.loadend = false;
 				this.$set(this, 'rankList', []);
 				this.getBrokerageRankList();
-				this.getBrokerageRankNumber();
+				this.getBrokerageRankNumber(this.type);
 			},
 			getBrokerageRankNumber(type) {
 				brokerageRankNumber({
@@ -124,23 +124,16 @@
 					type: this.type
 				}).then(res => {
 					let list = res.data;
-					let loadend = list.length < this.limit;
-					this.rankList = this.$util.SplitArray(list, this.rankList);
-					this.$set(that,'rankList',this.rankList);
-					this.loadend = loadend;
+					let loadend = list.length <= this.limit;
+					this.rankList.push.apply(this.rankList, list);
 					this.loading = false;
-					this.loadtitle = loadend ? "哼😕~我也是有底线的~" : "加载更多"
-					// let list = res.data;
-					// let loadend = list.length < this.limit;
-					// this.rankList.push.apply(this.rankList, list);
-					// this.loading = false;
-					// this.loadend = loadend;
-					// this.loadTitle = loadend ? '😕我也是有底线的' : '加载更多';
-					// this.$set(this, 'rankList', this.rankList);
-					// this.position = res.data.position;
+					this.loadend = loadend;
+					this.loadTitle = loadend ? '😕我也是有底线的' : '加载更多';
+					this.$set(this, 'rankList', this.rankList);
+					//this.position = res.data.position;
 				}).catch(err => {
 					this.loading = false;
-					this.loadTitle = '加载更多';
+					this.loadTitle = '加载更多'; 
 				})
 			}
 		},
diff --git a/pages/users/goods_comment_con/index.vue b/pages/users/goods_comment_con/index.vue
index b35de0af..c5ef3876 100644
--- a/pages/users/goods_comment_con/index.vue
+++ b/pages/users/goods_comment_con/index.vue
@@ -185,13 +185,11 @@
 				});
 				value.productScore = product_score;
 				value.serviceScore = service_score;
-				console.log("that.pics");
-				let aa = JSON.stringify(that.pics);
-				console.log(typeof aa);
-				value.pics = JSON.stringify(that.pics);
+				value.pics = that.pics.length>0?JSON.stringify(that.pics):'';
 				value.productId = that.productId;
 				value.oid = that.evaluateId;
 				value.unique = that.unique;
+				value.sku = that.productInfo.attrInfo.suk;
 				uni.showLoading({
 					title: "正在发布评论……"
 				});
diff --git a/pages/users/goods_details_store/index.vue b/pages/users/goods_details_store/index.vue
index f477c908..a679ef95 100644
--- a/pages/users/goods_details_store/index.vue
+++ b/pages/users/goods_details_store/index.vue
@@ -11,8 +11,16 @@
 				</div>
 				<div class="row-right">
 					<div>
+						<!-- #ifdef H5 -->
 						<a class="store-phone" :href="'tel:' + item.phone"><span class="iconfont icon-dadianhua01"></span></a>
+						<!-- #endif -->
+						<!-- #ifdef MP -->
+						<view class="store-phone" @click="call(item.phone)"><text class="iconfont icon-dadianhua01"></text></view>
+						<!-- #endif -->
 					</div>
+					<!-- <div>
+						<a class="store-phone" :href="'tel:' + item.phone"><span class="iconfont icon-dadianhua01"></span></a>
+					</div> -->
 					<div class="store-distance" @click.stop="showMaoLocation(item)">
 						<span class="addressTxt" v-if="item.range">距离{{ item.range }}千米</span>
 						<span class="addressTxt" v-else>查看地图</span>
@@ -89,12 +97,18 @@
 				this.getList();
 			} else {
 				this.selfLocation();
+				this.getList();
 			}
 			// this.$scroll(this.$refs.container, () => {
 			//   !this.loading && this.getList();
 			// });
 		},
 		methods: {
+			call(phone) {
+				uni.makePhoneCall({
+					phoneNumber: phone,
+				});
+			},
 			selfLocation() {
 				let self = this
 				uni.getLocation({
diff --git a/pages/users/goods_return/index.vue b/pages/users/goods_return/index.vue
index 5d787133..e9a81074 100644
--- a/pages/users/goods_return/index.vue
+++ b/pages/users/goods_return/index.vue
@@ -141,7 +141,6 @@
 			    DelPic:function(e){
 			      let index = e, that = this;
 			      that.refund_reason_wap_imgPath.splice(index, 1);
-				//  that.$set(that,'refund_reason_wap_imgPath',that.refund_reason_wap_imgPath);
 			    },
 			    /**
 			     * 上传文件
@@ -150,10 +149,7 @@
 			    uploadpic:function(){
 			      let that=this;
 				  that.$util.uploadImageOne({url:'user/upload/image',name:'multipart', model:"product", pid:1}, function(res){
-					//  that.refund_reason_wap_img.push(res.data.url);
 					  that.refund_reason_wap_imgPath.push(res.data.url);
-					 // that.$set(that,'refund_reason_wap_img',that.refund_reason_wap_img);
-					//  that.$set(that,'refund_reason_wap_imgPath',that.refund_reason_wap_imgPath);
 				  });
 			    },
 				
@@ -161,11 +157,9 @@
 			     * 申请退货
 			    */
 			    subRefund:function(e){
-					
 			      let that = this, value = e.detail.value;
-				  console.log(that.refund_reason_wap_imgPath.join(','));
 			      //收集form表单
-			      if (!value.refund_reason_wap_explain) return this.$util.Tips({title:'请输入退款原因'});
+			      // if (!value.refund_reason_wap_explain) return this.$util.Tips({title:'请输入退款原因'});
 			      orderRefundVerify({
 			        text: that.RefundArray[that.index] || '',
 			        refund_reason_wap_explain: value.refund_reason_wap_explain,
diff --git a/pages/users/login/index.vue b/pages/users/login/index.vue
index e192cc73..725abf8e 100644
--- a/pages/users/login/index.vue
+++ b/pages/users/login/index.vue
@@ -304,7 +304,7 @@
 						// 	that.codeUrl = `${VUE_APP_API_URL}/sms_captcha?key=${that.keyCode}`;
 						// 	that.isShowCode = true;
 						// }
-						that.$util.Tips({title:res.message});
+						that.$util.Tips({title:res});
 					});
 			},
 			navTap: function(index) {
@@ -347,7 +347,11 @@
 									url: '/pages/index/index'
 								});
 							}
-						})
+						}).catch(e => {
+						that.$util.Tips({
+							title: e
+						    });
+					     });
 					})
 					.catch(e => {
 						that.$util.Tips({
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index 73b7b168..fbfe2667 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -153,7 +153,9 @@
 		getCouponsOrderPrice,
 		orderCreate,
 		postOrderComputed,
-		orderPay
+		orderPay,
+		wechatOrderPay,
+		wechatQueryPayResult
 	} from '@/api/order.js';
 	import {
 		getAddressDefault,
@@ -211,11 +213,11 @@
 						payStatus: 1,
 					},
 					{
-						"name": "线下支付",//offlinePayStatu：1开启线下支付；2关闭；offlinePostage：true有邮费
+						"name": "线下支付", //offlinePayStatu：1开启线下支付；2关闭；offlinePostage：true有邮费
 						"icon": "icon-yinhangqia",
 						value: 'offline',
 						title: '线下支付',
-						payStatus: 2,
+						payStatus: 1,
 					},
 				],
 				payType: 'weixin', //支付方式
@@ -268,7 +270,7 @@
 				offlinePostage: "",
 				isAuto: false, //没有授权的不会自动授权
 				isShowAuth: false, //是否隐藏授权
-				from: '',
+				payChannel: '',
 				news: true,
 				again: false,
 				addAgain: false,
@@ -280,10 +282,10 @@
 		computed: mapGetters(['isLogin']),
 		onLoad: function(options) {
 			// #ifdef H5
-			this.from = this.$wechat.isWeixin() ? 'public' : 'weixinh5'
+			this.payChannel = this.$wechat.isWeixin() ? 'public' : 'weixinh5'
 			// #endif
 			// #ifdef MP
-			this.from = 'routine'
+			this.payChannel = 'routine'
 			// #endif
 			if (!options.cartId) return this.$util.Tips({
 				title: '请选择要购买的商品'
@@ -306,9 +308,7 @@
 				this.getaddressInfo();
 				this.getConfirm();
 				//调用子页面方法授权后执行获取地址列表
-				this.$nextTick(function() {
-					this.$refs.addressWindow.getAddressList();
-				})
+				this.$nextTick(function() {})
 			} else {
 				// #ifdef H5 || APP-PLUS
 				toLogin();
@@ -412,7 +412,6 @@
 					shippingType: parseInt(shippingType) + 1,
 					payType: this.payType
 				}).then(res => {
-					console.log(res)
 					let result = res.data.result.result;
 					if (result) {
 						this.totalPrice = result.orderId.payPrice;
@@ -511,7 +510,7 @@
 			 */
 			getConfirm: function() {
 				let that = this;
-				orderConfirm(that.cartId,that.news,this.addAgain,this.secKill,this.combination,this.bargain).then(res => {
+				orderConfirm(that.cartId, that.news, this.addAgain, this.secKill, this.combination, this.bargain).then(res => {
 					that.$set(that, 'userInfo', res.data.userInfo);
 					that.$set(that, 'integral', res.data.userInfo.integral);
 					that.$set(that, 'cartInfo', res.data.cartInfo);
@@ -523,11 +522,11 @@
 					that.$set(that, 'totalPrice', that.$util.$h.Add(parseFloat(res.data.priceGroup.totalPrice), parseFloat(res.data
 						.priceGroup.storePostage)));
 					that.$set(that, 'seckillId', parseInt(res.data.secKillId));
-					that.$set(that, 'store_self_mention', res.data.storeSelfMention == 'true'?true:false);
+					that.$set(that, 'store_self_mention', res.data.storeSelfMention == 'true' ? true : false);
 					that.cartArr[1].title = '可用余额:' + res.data.userInfo.nowMoney;
 					that.cartArr[0].payStatus = res.data.payWeixinOpen || 0
 					that.cartArr[1].payStatus = res.data.yuePayStatus || 0
-					if (res.data.offlinePayStatus == 2) {
+					if (res.data.offlinePayStatus == 1) {
 						that.cartArr[2].payStatus = 1
 					} else {
 						that.cartArr[2].payStatus = 0
@@ -536,7 +535,7 @@
 					// that.$set(that, 'cartArr', that.cartArr);
 					that.$set(that, 'ChangePrice', that.totalPrice);
 					that.getBargainId();
-					if(!that.secKill) that.getCouponList();
+					if (!that.secKill) that.getCouponList();
 				}).catch(err => {
 					return this.$util.Tips({
 						title: err
@@ -555,8 +554,8 @@
 				let BargainId = 0;
 				let combinationId = 0;
 				cartINfo.forEach(function(value, index, cartINfo) {
-					BargainId = cartINfo[index].bargainId,
-						combinationId = cartINfo[index].combinationId
+					BargainId = cartINfo[index].bargainId || 0,
+						combinationId = cartINfo[index].combinationId || 0
 				})
 				that.$set(that, 'BargainId', parseInt(BargainId));
 				that.$set(that, 'combinationId', parseInt(combinationId));
@@ -586,7 +585,7 @@
 				let that = this;
 				if (that.addressId) {
 					getAddressDetail(that.addressId).then(res => {
-						if(res.data){
+						if (res.data) {
 							res.data.isDefault = parseInt(res.data.isDefault);
 							that.addressInfo = res.data || {};
 							that.addressId = res.data.id || 0;
@@ -595,7 +594,7 @@
 					})
 				} else {
 					getAddressDefault().then(res => {
-						if(res.data){
+						if (res.data) {
 							res.data.isDefault = parseInt(res.data.isDefault);
 							that.addressInfo = res.data || {};
 							that.addressId = res.data.id || 0;
@@ -627,7 +626,8 @@
 				that.textareaStatus = false;
 				that.address.address = true;
 				that.pagesUrl = '/pages/users/user_address_list/index?cartId=' + this.cartId + '&pinkId=' + this.pinkId +
-					'&couponId=' + this.couponId + '&secKill=' + this.secKill + '&combination=' + this.combination + '&bargain=' + this.bargain;
+					'&couponId=' + this.couponId + '&secKill=' + this.secKill + '&combination=' + this.combination + '&bargain=' +
+					this.bargain;
 			},
 			realName: function(e) {
 				this.contacts = e.detail.value;
@@ -638,36 +638,176 @@
 			payment: function(data) {
 				let that = this;
 				orderCreate(that.orderKey, data).then(res => {
-					let result = res.data.result,
-					    status = res.data.status,
-						orderId = result.orderId,
-						jsConfig = res.data.jsConfig,
-						message = res.data.message;
-						if(that.totalPrice===0)return that.$util.Tips({
+					that.getOrderPay(res.data.orderNo, '支付成功');
+					// if(that.totalPrice===0)return that.$util.Tips({
+					// 				title: '支付成功',
+					// 				icon: 'success'
+					// 			});
+
+				}).catch(err => {
+					uni.hideLoading();
+					return that.$util.Tips({
+						title: err
+					});
+				});
+				// orderCreate(that.orderKey, data).then(res => {
+				// 	let result = res.data.result,
+				// 	    status = res.data.status,
+				// 		orderId = result.orderId,
+				// 		jsConfig = res.data.jsConfig,
+				// 		message = res.data.message;
+				// 		if(that.totalPrice===0)return that.$util.Tips({
+				// 						title: '支付成功',
+				// 						icon: 'success'
+				// 					});
+				// 		if(that.news == "false"){
+				// 			orderPay({
+				// 				'paytype': that.payType,
+				// 				'uni':res.data.result.key,
+				// 				// #ifdef MP 
+				// 				'from': 'routine',
+				// 				// #endif
+				// 				// #ifdef H5 || APP-PLUS
+				// 				'from': this.$wechat.isWeixin() ? 'public' : 'weixinh5',
+				// 				// #endif
+				// 			}).then(res=>{
+				// 				result = res.data.result;
+				// 				status = res.data.status;
+				// 				orderId = result.orderId;
+				// 				jsConfig = res.data.jsConfig;
+				// 				message = res.data.message;
+				// 				that.getPayType(status,orderId,message,jsConfig);
+				// 			})
+				// 		}else{
+				// 			that.getPayType(status,orderId,message,jsConfig);
+				// 		}
+				// }).catch(err => {
+				// 	uni.hideLoading();
+				// 	return that.$util.Tips({
+				// 		title: err
+				// 	});
+				// });
+			},
+			getOrderPay: function(orderNo, message) {
+				let that = this;
+				let goPages = '/pages/order_pay_status/index?order_id=' + orderNo + '&msg=' + message;
+				wechatOrderPay({
+					orderNo: orderNo,
+					// #ifdef MP
+					payChannel: 'routine',
+					// #endif
+					// #ifdef H5 || APP-PLUS
+					payChannel: that.$wechat.isWeixin() ? 'public' : 'weixinh5',
+					// #endif
+					payType: that.payType
+				}).then(res => {
+					let jsConfig = res.data.jsConfig;
+					switch (res.data.payType) {
+						case 'weixin':
+							// #ifdef MP
+							uni.requestPayment({
+								timeStamp: jsConfig.timeStamp,
+								nonceStr: jsConfig.nonceStr,
+								package: jsConfig.packages,
+								signType: jsConfig.signType,
+								paySign: jsConfig.paySign,
+								success: function(ress) {
+									uni.hideLoading();
+									if (that.BargainId || that.combinationId || that.pinkId || that.seckillId)
+										return that.$util.Tips({
+											title: '支付成功',
+											icon: 'success'
+										}, {
+											tab: 4,
+											url: goPages
+										});
+									return that.$util.Tips({
 										title: '支付成功',
 										icon: 'success'
+									}, {
+										tab: 5,
+										url: goPages
 									});
-						if(that.news == "false"){
-							orderPay({
-								'paytype': that.payType,
-								'uni':res.data.result.key,
-								// #ifdef MP 
-								'from': 'routine',
-								// #endif
-								// #ifdef H5 || APP-PLUS
-								'from': this.$wechat.isWeixin() ? 'public' : 'weixinh5',
-								// #endif
-							}).then(res=>{
-								result = res.data.result;
-								status = res.data.status;
-								orderId = result.orderId;
-								jsConfig = res.data.jsConfig;
-								message = res.data.message;
-								that.getPayType(status,orderId,message,jsConfig);
+								},
+								fail: function(e) {
+									uni.hideLoading();
+									return that.$util.Tips({
+										title: '取消支付'
+									}, {
+										tab: 5,
+										url: goPages + '&status=2'
+									});
+								},
+								complete: function(e) {
+									uni.hideLoading();
+									//关闭当前页面跳转至订单状态
+									if (e.errMsg == 'requestPayment:cancel') return that.$util.Tips({
+										title: '取消支付'
+									}, {
+										tab: 5,
+										url: goPages + '&status=2'
+									});
+								},
 							})
-						}else{
-							that.getPayType(status,orderId,message,jsConfig);
-						}
+							// #endif
+							// #ifdef H5
+							let data = {
+								timestamp: jsConfig.timeStamp,
+								nonceStr: jsConfig.nonceStr,
+								package: jsConfig.packages,
+								signType: jsConfig.signType,
+								paySign: jsConfig.paySign
+							};
+							that.$wechat.pay(data).then(res => {
+								if (res.errMsg == 'chooseWXPay:cancel') {
+									return that.$util.Tips({
+										title: '取消支付'
+									}, {
+										tab: 5,
+										url: goPages + '&status=2'
+									});
+								} else {
+									wechatQueryPayResult({
+										orderNo: orderNo
+									}).then(res => {
+										return that.$util.Tips({
+											title: '支付成功',
+											icon: 'success'
+										}, {
+											tab: 5,
+											url: goPages
+										});
+									}).cache(err => {
+										return that.$util.Tips({
+											title: err
+										});
+									})
+								}
+							})
+							// #endif
+							break;
+						case 'yue':
+							uni.hideLoading();
+							return that.$util.Tips({
+								title: message
+							}, {
+								tab: 5,
+								url: goPages + '&status=1'
+							});
+							break;
+					    case 'weixinh5':
+					       uni.hideLoading();
+					       that.$util.Tips({
+					       	title: '订单创建成功'
+					       }, {
+					       	tab: 5,
+					       	url: goPages + '&status=0'
+					       });
+					       setTimeout(() => {
+					       	location.href = jsConfig.mwebUrl;
+					       }, 100)
+					    	break;			
+					}
 				}).catch(err => {
 					uni.hideLoading();
 					return that.$util.Tips({
@@ -675,7 +815,7 @@
 					});
 				});
 			},
-			getPayType: function(status,orderId,message,jsConfig){
+			getPayType: function(status, orderId, message, jsConfig) {
 				let that = this;
 				let goPages = '/pages/order_pay_status/index?order_id=' + orderId + '&msg=' + message;
 				switch (status) {
@@ -690,7 +830,7 @@
 							url: goPages
 						});
 						break;
-					case 'SUCCESS':	
+					case 'SUCCESS':
 						uni.hideLoading();
 						if (that.BargainId || that.combinationId || that.pinkId || that.seckillId)
 							return that.$util.Tips({
@@ -699,7 +839,7 @@
 							}, {
 								tab: 4,
 								url: goPages
-							});	
+							});
 						return that.$util.Tips({
 							title: message,
 							icon: 'success'
@@ -761,12 +901,12 @@
 						let jsConfigAgain = jsConfig;
 						let packages = 'prepay_id=' + jsConfigAgain.prepayId;
 						let data = {
-							timestamp:jsConfigAgain.timeStamp,
-							nonceStr:jsConfigAgain.nonceStr,
-							package:packages,
-							signType:jsConfigAgain.signType,
-							paySign:jsConfigAgain.paySign,
-							h5PayUrl:jsConfigAgain.h5PayUrl
+							timestamp: jsConfigAgain.timeStamp,
+							nonceStr: jsConfigAgain.nonceStr,
+							package: packages,
+							signType: jsConfigAgain.signType,
+							paySign: jsConfigAgain.paySign,
+							h5PayUrl: jsConfigAgain.h5PayUrl
 						};
 						this.$wechat.pay(data).then(res => {
 							return that.$util.Tips({
@@ -788,7 +928,6 @@
 						break;
 					case 'PAY_DEFICIENCY':
 						uni.hideLoading();
-						//余额不足
 						return that.$util.Tips({
 							title: message
 						}, {
@@ -799,7 +938,7 @@
 					case "WECHAT_H5_PAY": //网页版公众号支付
 						setTimeout(() => {
 							let domain = encodeURIComponent(location.href);
-							let urls = jsConfigAgain.h5PayUrl + '&redirect_url='+ domain;
+							let urls = jsConfigAgain.h5PayUrl + '&redirect_url=' + domain;
 							location.href = urls;
 							return that.$util.Tips({
 								title: '支付成功',
@@ -812,7 +951,7 @@
 						break;
 				}
 			},
-			SubOrder: function(e) {	
+			SubOrder: function(e) {
 
 				let that = this,
 					data = {};
@@ -857,24 +996,27 @@
 					seckillId: that.seckillId,
 					mark: that.mark,
 					storeId: that.system_store.id || 0,
-					'from': that.from,
 					shippingType: that.$util.$h.Add(that.shippingType, 1),
-					isNew: that.news
+					isNew: that.news,
+					payChannel: that.payChannel
+
 				};
-				if (data.payType == 'yue' && parseFloat(that.userInfo.nowMoney) < parseFloat(that.totalPrice)) return that.$util.Tips({
-					title: '余额不足！'
-				});
+				if (data.payType == 'yue' && parseFloat(that.userInfo.nowMoney) < parseFloat(that.totalPrice)) return that.$util
+					.Tips({
+						title: '余额不足！'
+					});
 				uni.showLoading({
 					title: '订单支付中'
 				});
-				// #ifdef MP
-				openPaySubscribe().then(() => {
-					that.payment(data);
-				});
-				// #endif
-				// #ifndef MP
+				// // #ifdef MP
+				// openPaySubscribe().then(() => {
+				// 	that.payment(data);
+				// });
+				// // #endif
+				// // #ifndef MP
+				// that.payment(data);
+				// // #endif
 				that.payment(data);
-				// #endif
 			}
 		}
 	}
diff --git a/pages/users/promoter-list/index.vue b/pages/users/promoter-list/index.vue
index 016ced4b..a5251438 100644
--- a/pages/users/promoter-list/index.vue
+++ b/pages/users/promoter-list/index.vue
@@ -143,7 +143,6 @@
 				this.isShowAuth = e
 			},
 			setSort: function(sortKey,isAsc) {
-				console.log(sortKey);
 				let that = this;
 				that.isAsc = isAsc;
 				that.sort = sortKey+isAsc;
diff --git a/pages/users/retrievePassword/index.vue b/pages/users/retrievePassword/index.vue
index f38d95fc..e9937e6a 100644
--- a/pages/users/retrievePassword/index.vue
+++ b/pages/users/retrievePassword/index.vue
@@ -81,7 +81,6 @@
 			again() {
 				this.codeUrl =
 					VUE_APP_API_URL + "/captcha?" + this.keyCode + Date.parse(new Date());
-				console.log(this.codeUrl);
 			},
 			getCode() {
 				getCodeApi()
@@ -142,7 +141,6 @@
 						that.sendCode();
 					})
 					.catch(res => {
-						console.log(res, 'res')
 						// if (res.data.status === 402) {
 						// 	that.codeUrl = `${VUE_APP_API_URL}/sms_captcha?key=${that.keyCode}`;
 						// 	that.isShowCode = true;
diff --git a/pages/users/user_coupon/index.vue b/pages/users/user_coupon/index.vue
index ec00927a..2872be09 100644
--- a/pages/users/user_coupon/index.vue
+++ b/pages/users/user_coupon/index.vue
@@ -2,22 +2,20 @@
 	<view>
 		<view class='coupon-list' v-if="couponsList.length">
 			<view class='item acea-row row-center-wrapper' v-for='(item,index) in couponsList' :key="index">
-				<view class='money' :class='item.isValid === false ? "moneyGray" : ""'>
+				<view class='money' :class="item.validStr==='unusable'||item.validStr==='overdue'||item.validStr==='notStart' ? 'moneyGray' : ''">
 					<view>￥<text class='num'>{{item.money}}</text></view>
 					<view class="pic-num">满{{ item.minPrice }}元可用</view>
 				</view>
 				<view class='text'>
-					<view class='condition line1'>
-						<view class="line-title" :class="item.isValid === false ? 'bg-color-huic' : 'bg-color-check'" v-if="item.useType === 1">通用劵</view>
-						<view class="line-title" :class="item.isValid === false ? 'bg-color-huic' : 'bg-color-check'"  v-else-if="item.useType === 2">商品券</view>
-						<view class="line-title" :class="item.isValid === false ? 'bg-color-huic' : 'bg-color-check'" v-else-if="item.useType === 3">品类券</view>
-						
-						<view>{{item.name}}</view>
+					<view class='condition line2'>
+						<span class="line-title" :class="item.validStr==='unusable'||item.validStr==='overdue'||item.validStr==='notStart' ? 'bg-color-huic' : 'bg-color-check'" v-if="item.useType === 1">通用</span>
+						<span class="line-title" :class="item.validStr==='unusable'||item.validStr==='overdue'||item.validStr==='notStart' ? 'bg-color-huic' : 'bg-color-check'"  v-else-if="item.useType === 2">商品</span>
+						<span class="line-title" :class="item.validStr==='unusable'||item.validStr==='overdue'||item.validStr==='notStart' ? 'bg-color-huic' : 'bg-color-check'" v-else-if="item.useType === 3">品类</span>
+						<span>{{item.name}}</span>
 					</view>
 					<view class='data acea-row row-between-wrapper'>
-						<view>{{item.startTime}} ~ {{item.endTime}}</view>
-						<view class='bnt gray' v-if="item.isValid===false">已过期</view>
-						<view class='bnt bg-color' v-else>可使用</view>
+						<view>{{item.useStartTimeStr}}~{{item.useEndTimeStr}}</view>
+						<view class='bnt' :class="item.validStr==='unusable'||item.validStr==='overdue'||item.validStr==='notStart'?'gray':'bg-color'">{{item.validStr | validStrFilter}}</view>
 					</view>
 				</view>
 			</view>
@@ -55,6 +53,17 @@
 			// #endif
 			home
 		},
+		filters: {
+		    validStrFilter(status) {
+		      const statusMap = {
+		        'usable': '可用',
+		        'unusable': '已用',
+				'overdue': '过期',
+				'notStart': '未开始'
+		      }
+		      return statusMap[status]
+		    }
+		},
 		data() {
 			return {
 				couponsList: [],
@@ -111,24 +120,27 @@
 
 	.pic-num {
 		color: #ffffff;
-		font-size: 0.24rem;
+		font-size: 24rpx;
+	}
+	.coupon-list .item .text{
+		height: 100%;
 	}
 	.coupon-list .item .text .condition{
-		display: flex;
-		align-items: center;
+		/* display: flex;
+		align-items: center; */
 	}
 	.condition .line-title {
-		/* width: 90rpx; */
+		width: 90rpx;
 		height: 40rpx !important;
 		line-height: 40rpx !important;
-		padding: 0 10rpx;
+		padding: 2rpx 10rpx;
 		-webkit-box-sizing: border-box;
 		box-sizing: border-box;
 		background: rgba(255, 247, 247, 1);
 		border: 1px solid rgba(232, 51, 35, 1);
 		opacity: 1;
-		border-radius: 22rpx;
-		font-size: 20rpx !important;
+		border-radius: 20rpx;
+		font-size: 18rpx !important;
 		color: #e83323;
 		margin-right: 12rpx;
 	}
diff --git a/pages/users/user_get_coupon/index.vue b/pages/users/user_get_coupon/index.vue
index 096d3c5e..4b56549a 100644
--- a/pages/users/user_get_coupon/index.vue
+++ b/pages/users/user_get_coupon/index.vue
@@ -7,14 +7,15 @@
 					<view class="pic-num">满{{item.minPrice}}元可用</view>
 				</view>
 				<view class='text'>
-					<view class='condition line1'>
-					    <span class='line-title' :class='(item.isUse==true || item.isUse==2)?"gray":""' v-if='item.type===0'>通用劵</span>
-					    <span class='line-title' :class='(item.isUse==true || item.isUse==2)?"gray":""' v-else-if='item.type===1'>品类券</span>
-					    <span class='line-title' :class='(item.isUse==true || item.isUse==2)?"gray":""' v-else>商品券</span>
+					<view class='condition line2'>
+					    <span class='line-title' :class='(item.isUse==true || item.isUse==2)?"gray":""' v-if='item.useType===1'>通用</span>
+					    <span class='line-title' :class='(item.isUse==true || item.isUse==2)?"gray":""' v-else-if='item.useType===3'>品类</span>
+					    <span class='line-title' :class='(item.isUse==true || item.isUse==2)?"gray":""' v-else>商品</span>
 					    <span>{{item.name}}</span>
 					</view>
 					<view class='data acea-row row-between-wrapper'>
-						<view>{{ item.receiveStartTime ? item.receiveStartTime + "-" : ""}}{{ item.receiveEndTime }}</view>
+						<view v-if="item.day>0">领取后{{item.day}}天内可用</view>
+						<view v-else>{{ item.useStartTimeStr&& item.useEndTimeStr ? item.useStartTimeStr + " - " + item.useEndTimeStr : ""}}</view>
 						<view class='bnt gray' v-if="item.isUse==true">已领取</view>
 						<view class='bnt bg-color' v-else @click='getCoupon(item.id,index)'>立即领取</view>
 					</view>
diff --git a/pages/users/user_info/index001.vue b/pages/users/user_info/index001.vue
deleted file mode 100644
index 8fc2581a..00000000
--- a/pages/users/user_info/index001.vue
+++ /dev/null
@@ -1,475 +0,0 @@
-<template>
-	<view>
-		<form @submit="formSubmit" report-submit='true'>
-			<view class='personal-data'>
-				<!-- <view class="wrapper">
-					<view class="title">管理我的账号</view>
-					<view class="wrapList">
-						<view class="item acea-row row-between-wrapper" :class="item.uid === userInfo.uid ? 'on' : ''" v-for="(item,index) in switchUserInfo"
-						 :key="index" @click='switchAccounts(index)'>
-							<view class="picTxt acea-row row-between-wrapper">
-								<view class="pictrue" @click.stop='uploadpic' v-if='item.uid === userInfo.uid'>
-									<image :src='item.avatar'></image>
-									<image src='../../../static/images/alter.png' class="alter"></image>
-								</view>
-								<view class="pictrue" v-else>
-									<image :src='item.avatar'></image>
-								</view>
-								<view class="text">
-									<view class="name line1">{{ item.nickname }}</view>
-									<view class="phone" v-if="item.phone && item.user_type !='h5'">绑定手机号：{{ item.phone }}</view>
-									<view class="phone" v-else-if="item.phone && item.user_type =='h5'">账号：{{ item.phone }}</view>
-									<view class="phone" v-else>暂未绑定手机号</view>
-								</view>
-							</view>
-							<view class="currentBnt acea-row row-center-wrapper font-color" v-if='item.uid === userInfo.uid'>
-								当前账号
-							</view>
-							<view class="bnt font-color acea-row row-center-wrapper" v-else>
-								使用账号
-							</view>
-						</view>
-					</view>
-				</view> -->
-				<view class='list'>
-					<view class="item acea-row row-between-wrapper">
-						<view>头像</view>
-						<view class="pictrue" @click.stop='uploadpic'>
-							<image :src='userInfo.avatar'></image>
-							<image src='../../../static/images/alter.png' class="alter"></image>
-						</view>
-					</view>
-					<view class='item acea-row row-between-wrapper'>
-						<view>昵称</view>
-						<view class='input'><input type='text' name='nickname' :value='userInfo.nickname'></input></view>
-					</view>
-					<view class='item acea-row row-between-wrapper'>
-						<view>手机号码</view>
-						<navigator url="/pages/user_phone/index" hover-class="none" class="input" v-if="!userInfo.phone">
-							点击绑定手机号<text class="iconfont icon-xiangyou"></text>
-						</navigator>
-						<view class='input acea-row row-between-wrapper' v-else>
-							<input type='text' disabled='true' name='phone' :value='userInfo.phone' class='id'></input>
-							<text class='iconfont icon-suozi'></text>
-						</view>
-					</view>
-					<view class='item acea-row row-between-wrapper'>
-						<view>ID号</view>
-						<view class='input acea-row row-between-wrapper'>
-							<input type='text' :value='userInfo.uid' disabled='true' class='id'></input>
-							<text class='iconfont icon-suozi'></text>
-						</view>
-					</view>
-					<!-- #ifdef MP -->
-					<view class='item acea-row row-between-wrapper'>
-						<view>权限设置</view>
-						<view class="input" @click="Setting">
-							点击管理<text class="iconfont icon-xiangyou"></text>
-						</view>
-					</view>
-					<!-- #endif -->
-					<view class="item acea-row row-between-wrapper" v-if="userInfo.phone && userInfo.user_type == 'h5'">
-						<view>密码</view>
-						<navigator url="/pages/user_pwd_edit/index" hover-class="none" class="input">
-							点击修改密码<text class="iconfont icon-xiangyou"></text>
-						</navigator>
-					</view>
-				</view>
-				<button class='modifyBnt bg-color' formType="submit">保存修改</button>
-				<!-- #ifdef H5 -->
-				<view class="logOut cart-color acea-row row-center-wrapper" @click="outLogin" v-if="!this.$wechat.isWeixin()">退出登录</view>
-				<!-- #endif -->
-			</view>
-		</form>
-		<!-- #ifdef MP -->
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
-		<!-- #endif -->
-	</view>
-</template>
-
-<script>
-	import {
-		getUserInfo,
-		userEdit,
-		getLogout
-	} from '@/api/user.js';
-	import {
-		switchH5Login
-	} from '@/api/api.js';
-	import {
-		toLogin
-	} from '@/libs/login.js';
-	import {
-		mapGetters
-	} from "vuex";
-	import dayjs from "@/plugin/dayjs/dayjs.min.js";
-	// #ifdef MP
-	import authorize from '@/components/Authorize';
-	// #endif
-	export default {
-		components: {
-			// #ifdef MP
-			authorize
-			// #endif
-		},
-		data() {
-			return {
-				userInfo: {},
-				loginType: 'h5', //app.globalData.loginType
-				userIndex: 0,
-				switchUserInfo: [],
-				isAuto: false, //没有授权的不会自动授权
-				isShowAuth: false //是否隐藏授权
-			};
-		},
-		computed: mapGetters(['isLogin']),
-		onLoad() {
-			if (this.isLogin) {
-				this.getUserInfo();
-			} else {
-				// #ifdef H5 || APP-PLUS
-				toLogin();
-				// #endif 
-				// #ifdef MP
-				this.isAuto = true;
-				this.$set(this, 'isShowAuth', true)
-				// #endif
-			}
-		},
-		methods: {
-			/**
-			 * 授权回调
-			 */
-			onLoadFun: function() {
-				this.getUserInfo();
-			},
-			// 授权关闭
-			authColse: function(e) {
-				this.isShowAuth = e
-			},
-			/**
-			 * 小程序设置
-			 */
-			Setting: function() {
-				uni.openSetting({
-					success: function(res) {
-						console.log(res.authSetting)
-					}
-				});
-			},
-			switchAccounts: function(index) {
-				let userInfo = this.switchUserInfo[index],
-					that = this;
-				that.userIndex = index;
-				if (that.switchUserInfo.length <= 1) return true;
-				if (userInfo === undefined) return that.$util.Tips({
-					title: '切换的账号不存在'
-				});
-				if (userInfo.user_type === 'h5') {
-					uni.showLoading({
-						title: '正在切换中'
-					});
-					switchH5Login().then(res => {
-						uni.hideLoading();
-						let newTime = Math.round(new Date() / 1000);
-						that.$store.commit("LOGIN", {
-							'token': res.data.token,
-							'time': dayjs(res.data.expires_time) - newTime
-						});
-						that.getUserInfo();
-
-					}).catch(err => {
-						uni.hideLoading();
-						return that.$util.Tips({
-							title: err
-						});
-					})
-				} else {
-					that.$store.commit("LOGOUT");
-					uni.showLoading({
-						title: '正在切换中'
-					});
-					// #ifdef H5 || APP-PLUS
-					toLogin();
-					// #endif 
-					// #ifdef MP
-					that.isAuto = true;
-					that.$set(that, 'isShowAuth', true);
-					// #endif
-				}
-			},
-			/**
-			 * 退出登录
-			 * 
-			 */
-			outLogin: function() {
-				let that = this;
-				if (that.loginType == 'h5') {
-					uni.showModal({
-					    title: '提示',
-					    content: '确认退出登录?',
-					    success: function (res) {
-					        if (res.confirm) {
-					            getLogout()
-					              .then(res => {
-					                that.$store.commit("LOGOUT");
-									uni.switchTab({
-									    url: '/pages/index/index'
-									});
-					              })
-					              .catch(err => {
-					                console.log(err);
-					              });
-					        } else if (res.cancel) {
-					            console.log('用户点击取消');
-					        }
-					    }
-					});	
-				}
-			},
-			/**
-			 * 获取用户详情
-			 */
-			getUserInfo: function() {
-				let that = this;
-				getUserInfo().then(res => {
-					that.$set(that, 'userInfo', res.data);
-					let switchUserInfo = res.data.switchUserInfo || [];
-					for (let i = 0; i < switchUserInfo.length; i++) {
-						if (switchUserInfo[i].uid == that.userInfo.uid) that.userIndex = i;
-						// 切割h5用户；user_type状态：h5、routine（小程序）、wechat（公众号）；注：只有h5未注册手机号时，h5才可和小程序或是公众号数据想通；
-						//#ifdef H5
-						if (
-							!that.$wechat.isWeixin() &&
-							switchUserInfo[i].user_type != "h5" &&
-							switchUserInfo[i].phone === ""
-						)
-							switchUserInfo.splice(i, 1);
-						//#endif
-					}
-					that.$set(that, "switchUserInfo", switchUserInfo);
-				});
-			},
-			/**
-			 * 上传文件
-			 * 
-			 */
-			uploadpic: function() {
-				let that = this;
-				that.$util.uploadImageOne('upload/image', function(res){
-					console.log('mmj');
-					let userInfo = that.switchUserInfo[that.userIndex];
-					if (userInfo !== undefined) {
-						userInfo.avatar = res.data.url;
-					}
-					that.switchUserInfo[that.userIndex] = userInfo;
-					that.$set(that,'switchUserInfo',that.switchUserInfo);
-				});
-			},
-
-			/**
-			 * 提交修改
-			 */
-			formSubmit: function(e) {
-				console.log(e);
-				let that = this,
-					value = e.detail.value,
-					userInfo = that.switchUserInfo[that.userIndex];
-				if (!value.nickname) return that.$util.Tips({
-					title: '用户姓名不能为空'
-				});
-				console.log('666666666666666666');
-				// value.avatar = userInfo.avatar;
-				userEdit(value).then(res => {
-					return that.$util.Tips({
-						title: res.msg,
-						icon: 'success'
-					}, {
-						tab: 3,
-						url: 1
-					});
-				}).catch(msg => {
-					return that.$util.Tips({	
-						title: msg || '保存失败，您并没有修改'
-					}, {
-						tab: 3,
-						url: 1
-					});
-				});
-			}
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	.personal-data .wrapper {
-		margin: 10rpx 0;
-		background-color: #fff;
-		padding: 36rpx 30rpx 13rpx 30rpx;
-	}
-
-	.personal-data .wrapper .title {
-		margin-bottom: 30rpx;
-		font-size: 32rpx;
-		color: #282828;
-	}
-
-	.personal-data .wrapper .wrapList .item {
-		width: 690rpx;
-		height: 160rpx;
-		background-color: #f8f8f8;
-		border-radius: 20rpx;
-		margin-bottom: 22rpx;
-		padding: 0 30rpx;
-		position: relative;
-		border: 2rpx solid #f8f8f8;
-		box-sizing:border-box;
-	}
-
-	.personal-data .wrapper .wrapList .item.on {
-		border-color: #e93323;
-		border-radius: 20rpx;
-		background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArIAAACgCAYAAADw+I85AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyhpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ1IDc5LjE2MzQ5OSwgMjAxOC8wOC8xMy0xNjo0MDoyMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTkgKE1hY2ludG9zaCkiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6M0QzNkY3NzlCNzJCMTFFOTgyNEU4QzhGQTRFRUY2REQiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6M0QzNkY3N0FCNzJCMTFFOTgyNEU4QzhGQTRFRUY2REQiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDozRDM2Rjc3N0I3MkIxMUU5ODI0RThDOEZBNEVFRjZERCIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDozRDM2Rjc3OEI3MkIxMUU5ODI0RThDOEZBNEVFRjZERCIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pn3rJMAAAArUSURBVHja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");
-		background-size: 100% 100%;
-		background-color: #fff9f9;
-		background-repeat: no-repeat;
-	}
-
-	.personal-data .wrapper .wrapList .item .picTxt {
-		width: 445rpx;
-	}
-
-	.personal-data .wrapper .wrapList .item .picTxt .pictrue {
-		width: 96rpx;
-		height: 96rpx;
-		position: relative;
-	}
-
-	.personal-data .wrapper .wrapList .item .picTxt .pictrue image {
-		width: 100%;
-		height: 100%;
-		border-radius: 50%;
-	}
-
-	.personal-data .wrapper .wrapList .item .picTxt .pictrue .alter {
-		width: 30rpx;
-		height: 30rpx;
-		border-radius: 50%;
-		position: absolute;
-		bottom: 0;
-		right: 0;
-	}
-
-	.personal-data .wrapper .wrapList .item .picTxt .text {
-		width: 325rpx;
-	}
-
-	.personal-data .wrapper .wrapList .item .picTxt .text .name {
-		width: 100%;
-		font-size: 30rpx;
-		color: #282828;
-	}
-
-	.personal-data .wrapper .wrapList .item .picTxt .text .phone {
-		font-size: 24rpx;
-		color: #999;
-		margin-top: 10rpx;
-	}
-
-	.personal-data .wrapper .wrapList .item .bnt {
-		font-size: 24rpx;
-		background-color: #fff;
-		border-radius: 27rpx;
-		width: 140rpx;
-		height: 54rpx;
-		border: 2rpx solid #e93323;
-	}
-
-	.personal-data .wrapper .wrapList .item .currentBnt {
-		position: absolute;
-		right: 0;
-		top: 0;
-		font-size: 26rpx;
-		background-color: rgba(233, 51, 35, 0.1);
-		width: 140rpx;
-		height: 48rpx;
-		border-radius: 0 20rpx 0 20rpx;
-	}
-
-	.personal-data .list {
-		margin-top: 15rpx;
-		background-color: #fff;
-	}
-
-	.personal-data .list .item {
-		padding: 30rpx 30rpx 30rpx 0;
-		border-bottom: 1rpx solid #f2f2f2;
-		margin-left: 30rpx;
-		font-size: 32rpx;
-		color: #282828;
-	}
-
-	.personal-data .list .item .phone {
-		width: 160rpx;
-		height: 56rpx;
-		font-size: 24rpx;
-		color: #fff;
-		line-height: 56rpx;
-		border-radius: 32rpx
-	}
-
-	.personal-data .list .item .pictrue {
-		width: 88rpx;
-		height: 88rpx;
-		position: relative;
-	}
-
-	.personal-data .list .item .pictrue image {
-		width: 100%;
-		height: 100%;
-		border-radius: 50%;
-	}
-	
-	.personal-data .list .item .pictrue .alter{
-		width: 30rpx;
-		height: 30rpx;
-		border-radius: 50%;
-		position: absolute;
-		bottom: 0;
-		right: 0;
-	}
-
-	.personal-data .list .item .input {
-		width: 415rpx;
-		text-align: right;
-		color: #868686;
-	}
-
-	.personal-data .list .item .input .id {
-		width: 365rpx;
-	}
-
-	.personal-data .list .item .input .iconfont {
-		font-size: 35rpx;
-	}
-
-	.personal-data .modifyBnt {
-		font-size: 32rpx;
-		color: #fff;
-		width: 690rpx;
-		height: 90rpx;
-		border-radius: 50rpx;
-		text-align: center;
-		line-height: 90rpx;
-		margin: 76rpx auto 0 auto;
-	}
-
-	.personal-data .logOut {
-		font-size: 32rpx;
-		text-align: center;
-		width: 690rpx;
-		height: 90rpx;
-		border-radius: 45rpx;
-		margin: 30rpx auto 0 auto;
-	}
-</style>
diff --git a/pages/users/user_payment/index.vue b/pages/users/user_payment/index.vue
index ce859812..dda23ae5 100644
--- a/pages/users/user_payment/index.vue
+++ b/pages/users/user_payment/index.vue
@@ -12,16 +12,15 @@
 					<view class="item" :class="active==index?'on':''" v-for="(item,index) in navRecharge" :key="index" @click="navRecharges(index)">{{item}}</view>
 				</view>
 				<view class='tip picList' v-if='!active'>
-					<view class="pic-box pic-box-color acea-row row-center-wrapper row-column" :class="activePic == index ? 'pic-box-color-active' : ''"
+					<view class="pic-box pic-box-color acea-row row-center-wrapper row-column" :class="activePic === index ? 'pic-box-color-active' : ''"
 					 v-for="(item, index) in picList" :key="index" @click="picCharge(index, item)">
 						<view class="pic-number-pic">
 							{{ item.price }}<span class="pic-number"> 元</span>
 						</view>
 						<view class="pic-number">赠送：{{ item.giveMoney }} 元</view>
 					</view>
-					<view class="pic-box pic-box-color acea-row row-center-wrapper" :class="activePic == picList.length ? 'pic-box-color-active' : ''"
-					 @click="picCharge(picList.length)">
-						<input type="number" placeholder="其他" v-model="money" class="pic-box-money pic-number-pic" :class="activePic == picList.length ? 'pic-box-color-active' : ''" />
+					<view class="pic-box pic-box-color acea-row row-center-wrapper" :class="parseFloat(activePic)===parseFloat(picList.length)?'pic-box-color-active':''" @click="picCharge(picList.length)">
+						<input type="number" placeholder="其他" v-model="money" class="pic-box-money pic-number-pic" :class="parseFloat(activePic) === parseFloat(picList.length) ? 'pic-box-color-active' : ''" />
 					</view>
 					<view class="tips-box">
 						<view class="tips mt-30">注意事项：</view>
@@ -485,12 +484,11 @@
 			text-align: center;
 		}
 
-		.pic-box-color-active {
+	}
+    .pic-box-color-active {
 			background-color: #ec3323 !important;
 			color: #fff !important;
-		}
 	}
-
 	.tips-box {
 		.tips {
 			font-size: 28rpx;
diff --git a/pages/users/user_return_list/index.vue b/pages/users/user_return_list/index.vue
index 42a0ccf1..a0e93697 100644
--- a/pages/users/user_return_list/index.vue
+++ b/pages/users/user_return_list/index.vue
@@ -124,8 +124,6 @@
 					let loadend = list.length < that.limit;
 					that.orderList = that.$util.SplitArray(list, that.orderList);
 					that.$set(that,'orderList',that.orderList);
-					console.log('8888888888888888888');
-					console.log(that.orderList);
 					that.loadend = loadend;
 					that.loading = false;
 					that.loadTitle = loadend ? "我也是有底线的" : '加载更多';
diff --git a/pages/users/user_spread_code/index.vue b/pages/users/user_spread_code/index.vue
index 01fc85c5..8a7bac06 100644
--- a/pages/users/user_spread_code/index.vue
+++ b/pages/users/user_spread_code/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view style="height: 100%;">
 		<view class='distribution-posters'>
 				<swiper :indicator-dots="indicatorDots" :autoplay="autoplay" :circular="circular" :interval="interval" :duration="duration"
 			 @change="bindchange" previous-margin="40px" next-margin="40px">
@@ -23,9 +23,9 @@
 		<!-- #ifdef MP -->
 		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
 		<!-- #endif -->
-		<view class="canvas">
+		<view class="canvas" v-if="canvasStatus">
 			<canvas style="width:750px;height:1190px;" canvas-id="canvasOne"></canvas>
-			<canvas style="" canvas-id="qrcode" :style="{width: `${qrcodeSize}px`, height: `${qrcodeSize}px`}" />
+			<canvas canvas-id="qrcode" :style="{width: `${qrcodeSize}px`, height: `${qrcodeSize}px`}"/>
 		</view>
 	</view>
 </template>
@@ -76,11 +76,10 @@
 				poster: '',
 				isAuto: false, //没有授权的不会自动授权
 				isShowAuth: false, //是否隐藏授权
-				imagePath: '',
 				qrcodeSize: 1000,
 				PromotionCode: '',
 				base64List: [],
-				posterbackgd: 'https://image.java.crmeb.net/image/product/2020/08/03/755bf516b1ca4b6db3bfeaa4dd5901cdh71kob20re.jpg'
+				canvasStatus: true //海报绘图标签
 			};
 		},
 		computed: mapGetters(['isLogin']),
@@ -143,7 +142,6 @@
 					imageBase64({url:item.pic}).then(res=>{
 						spreadList[index] = res.data.code;
 						that.$set(that,'base64List',spreadList);
-						//that.$set(that, 'poster', spreadList[0]);
 					})
 				})
 				// #endif
@@ -153,7 +151,6 @@
 				});
 				// #endif
 				that.userInfos();
-				console.log('上',this.base64List)
 			},
 			// 小程序二维码
 			getQrcode(){
@@ -164,7 +161,7 @@
 				}
 				let arrImagesUrl = "";
 				uni.downloadFile({
-					url: this.base64List[0], //仅为示例，并非真实的资源
+					url: this.base64List[0], 
 					success: (res) => {
 						arrImagesUrl = res.tempFilePath;
 					}
@@ -172,12 +169,18 @@
 				getQrcode(data).then(res=>{
 					base64src(res.data.code, res => {
 						that.PromotionCode = res;
-						console.log('第一张',that.PromotionCode)
 					});
 					setTimeout(() => {
 						that.PosterCanvas(arrImagesUrl, that.PromotionCode, that.userInfo.nickname, 0);		
-					}, 200);
-				})
+					}, 300);
+				}).catch(err => {
+					uni.hideLoading();
+					that.$util.Tips({
+						title: err
+					});
+					that.$set(that, 'canvasStatus', false);
+					//that.getQrcode();
+				});
 			},
 			// 生成二维码；
 			make() {
@@ -190,10 +193,14 @@
 					margin: 10,
 					success: res => {
 						that.PromotionCode = res;
-						that.PosterCanvas(this.base64List[0], that.PromotionCode, that.userInfo.nickname,0);
+						setTimeout(() => {
+							that.PosterCanvas(this.base64List[0], that.PromotionCode, that.userInfo.nickname,0);		
+						}, 300);
+					},
+					complete: (res) => {
 					},
-					complete: () => {},
 					fail: res => {
+						uni.hideLoading();
 						that.$util.Tips({
 							title: '海报二维码生成失败！'
 						});
@@ -222,35 +229,17 @@
 								  canvasId: 'canvasOne',
 								  fileType: 'jpg',
 								  success: function(res) {
-									  console.log("成功",res)
 									// 在H5平台下，tempFilePath 为 base64
 									uni.hideLoading();
-									that.imagePath = res.tempFilePath;
 									that.spreadList[index].pic = res.tempFilePath;
-									that.poster = res.tempFilePath;
-									console.log("spreadList = ", that.spreadList[index].pic)
+									that.$set(that, 'poster', res.tempFilePath);
+									that.$set(that, 'canvasStatus', false);
 								  } 
 								})
 							})						
 						}, 100);
-						// context.draw(true,function(){
-						// 	uni.canvasToTempFilePath({
-						// 	  destWidth: 750,
-						// 	  destHeight: 1190,
-						// 	  canvasId: 'canvasOne',
-						// 	  fileType: 'jpg',
-						// 	  success: function(res) {
-						// 		  console.log("成功",res)
-						// 	    // 在H5平台下，tempFilePath 为 base64
-						// 		uni.hideLoading();
-						// 		that.imagePath = res.tempFilePath;
-						// 		that.spreadList[index].pic = res.tempFilePath;
-						// 	  } 
-						// 	})
-						// })
 					},
 					fail: function(err) {
-						console.log("失败",err)
 						uni.hideLoading();
 						that.$util.Tips({
 							title: '无法获取图片信息'
@@ -274,99 +263,59 @@
 				this.swiperIndex = index;
 				let arrImagesUrl = "";
 				uni.downloadFile({
-					url: base64List[index], //仅为示例，并非真实的资源
+					url: base64List[index], 
 					success: (res) => {
-						console.log('移动',res)
 						arrImagesUrl = res.tempFilePath;
-						console.log('移动图片',arrImagesUrl)
-						console.log('移动二维码',this.PromotionCode)
 						setTimeout(() => {
+							this.$set(this, 'canvasStatus', true);
 							this.PosterCanvas(arrImagesUrl, this.PromotionCode, this.userInfo.nickname, index);			
-						}, 200);
+						}, 300);
 					}
 				});			
 			},
 			// 点击保存海报
 			savePosterPath: function() {
 				let that = this;
-				uni.downloadFile({
-					url: that.poster,
-					success(resFile) {
-						if (resFile.statusCode === 200) {
-							uni.getSetting({
-								success(res) {
-									if (!res.authSetting['scope.writePhotosAlbum']) {
-										uni.authorize({
-											scope: 'scope.writePhotosAlbum',
-											success() {
-												uni.saveImageToPhotosAlbum({
-													filePath: resFile.tempFilePath,
-													success: function(res) {
-														return that.$util.Tips({
-															title: '保存成功'
-														});
-													},
-													fail: function(res) {
-														return that.$util.Tips({
-															title: res
-														});
-													},
-													complete: function(res) {},
-												})
-											},
-											fail() {
-												uni.showModal({
-													title: '您已拒绝获取相册权限',
-													content: '是否进入权限管理，调整授权？',
-													success(res) {
-														if (res.confirm) {
-															uni.openSetting({
-																success: function(res) {
-																	console.log(res.authSetting)
-																}
-															});
-														} else if (res.cancel) {
-															return that.$util.Tips({
-																title: '已取消！'
-															});
-														}
-													}
-												})
-											}
-										})
-									} else {
-										uni.saveImageToPhotosAlbum({
-											filePath: resFile.tempFilePath,
-											success: function(res) {
-												return that.$util.Tips({
-													title: '保存成功'
-												});
-											},
-											fail: function(res) {
-												return that.$util.Tips({
-													title: res
-												});
-											},
-											complete: function(res) {},
-										})
-									}
-								},
-								fail(res) {
-
+				uni.getSetting({
+					success(res) {
+						if (!res.authSetting['scope.writePhotosAlbum']) {
+							uni.authorize({
+								scope: 'scope.writePhotosAlbum',
+								success() {
+									uni.saveImageToPhotosAlbum({
+										filePath: that.poster,
+										success: function(res) {
+											that.$util.Tips({
+												title: '保存成功',
+												icon: 'success'
+											});
+										},
+										fail: function(res) {
+											that.$util.Tips({
+												title: '保存失败'
+											});
+										}
+									});
 								}
-							})
+							});
 						} else {
-							return that.$util.Tips({
-								title: resFile
+							uni.saveImageToPhotosAlbum({
+								filePath: that.poster,
+								success: function(res) {
+									that.$util.Tips({
+										title: '保存成功',
+										icon: 'success'
+									});
+								},
+								fail: function(res) {
+									that.$util.Tips({
+										title: '保存失败'
+									});
+								}
 							});
 						}
-					},
-					fail(res) {
-						return that.$util.Tips({
-							title: res
-						});
 					}
-				})
+				});
 			},
 			userInfos() {
 				let that = this;
@@ -399,11 +348,18 @@
 <style lang="scss">
 	page {
 		background-color: #a3a3a3 !important;
+		height: 100% !important;
 	}
 	.canvas{
-		position: fixed;
-		z-index: -5rpx;
-		opacity: 0;
+		position: relative;
+	}
+	.distribution-posters{
+		width: 100%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
 	}
 	.distribution-posters swiper {
 		width: 100%;
diff --git a/static/css/base.css b/static/css/base.css
index 55f0333b..00461e38 100644
--- a/static/css/base.css
+++ b/static/css/base.css
@@ -192,11 +192,12 @@
 page {
 	font-size: 28rpx;
 	background-color: #f5f5f5;
-	color: #333
+	color: #333;
+	/* height: 100%; */
 }
 
 body,html {
-	height: unset
+/* 	height: unset */
 }
 
 button {
diff --git a/static/css/style.scss b/static/css/style.scss
index 9353aa1f..eb1bdc69 100644
--- a/static/css/style.scss
+++ b/static/css/style.scss
@@ -307,7 +307,7 @@
 .coupon-list .item .money.moneyGray{background-image:url('data:image/png;base64,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');}
 .coupon-list .item .money .num{font-size:60rpx;}
 .coupon-list .item .text{width:450rpx;padding:0 17rpx 0 24rpx;box-sizing:border-box;background-color:#fff;}
-.coupon-list .item .text .condition{font-size:30rpx;color:#282828;height:93rpx;line-height:93rpx;border-bottom:1rpx solid #f0f0f0;}
+.coupon-list .item .text .condition{font-size:26rpx;color:#282828;height:93rpx;padding-top: 18rpx;}
 .coupon-list .item .text .data{font-size:20rpx;color:#999;height:76rpx;}
 .coupon-list .item .text .data .bnt{width:136rpx;height:44rpx;border-radius:22rpx;font-size:22rpx;text-align:center;line-height:44rpx;color:#fff;}
 .coupon-list .item .text .data .bnt.gray{background-color:#ccc;}
diff --git a/utils/base64src.js b/utils/base64src.js
index c449f979..71339597 100644
--- a/utils/base64src.js
+++ b/utils/base64src.js
@@ -1,4 +1,4 @@
-const fsm = wx.getFileSystemManager();
+const fsm = uni.getFileSystemManager ? uni.getFileSystemManager() : null;
 const FILE_BASE_NAME = 'tmp_base64src'; //自定义文件名
 
 export function base64src(base64data, cb) {
diff --git a/utils/util.js b/utils/util.js
index 6e749cf1..672a964a 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -157,157 +157,124 @@ import {
  		arr.push(text.slice(str, text.length));
  		return [strLength, arr, rows] //  [处理文字的总字节长度，每行显示内容的数组，行数]
  	},
-	// 生成海报
-	PosterCanvas:function(arrImages, storeName, price, successFn){
+	
+	/**
+	 * 获取分享海报
+	 * @param array arr2 海报素材
+	 * @param string store_name 素材文字
+	 * @param string price 价格
+	 * @param string ot_price 原始价格
+	 * @param function successFn 回调函数
+	 * 
+	 * 
+	 */
+	PosterCanvas: function(arr2, store_name, price,ot_price, successFn) {
+		let that = this;
 		uni.showLoading({
 			title: '海报生成中',
 			mask: true
 		});
-		let context = uni.createCanvasContext('firstCanvas')
-		context.clearRect(0, 0, 0, 0);
-		let that = this;
+		const ctx = uni.createCanvasContext('firstCanvas');
+		ctx.clearRect(0, 0, 0, 0);
+		/**
+		 * 只能获取合法域名下的图片信息,本地调试无法获取
+		 * 
+		 */
+		ctx.fillStyle = '#fff';
+		ctx.fillRect(0, 0, 750, 1150);
 		uni.getImageInfo({
-		            src: arrImages[0],
-		            success: function (image) {
-						console.log('image成功', image)
-						context.drawImage(arrImages[0], 0, 0, 750, 1190);
-						context.drawImage(arrImages[1], 0, 0, 750, 750);
-						context.save();
-						context.drawImage(arrImages[2], 110, 1000, 140, 140);
-						context.restore();
-						context.setFontSize(30);
-						context.setTextAlign('center');
-						let maxText = 28;
-						let text = storeName;
-						let topText = '';
-						let bottomText = '';
-						let len = text.length;
-						if(len>maxText*2){
-							text = text.slice(0,maxText*2-4)+'......';
-							topText = text.slice(0,maxText-1);
-							bottomText = text.slice(maxText-1,len);
-						}else{
-							if(len>maxText){
-								topText = text.slice(0,maxText-1);
-								bottomText = text.slice(maxText-1,len);
-							}else{
-								topText = text;
-								bottomText = '';
-							}
-						}
-						context.fillText(topText, 750/2, 800);
-						context.fillText(bottomText, 750/2, 840);
-						context.setFontSize(37);
-						context.setTextAlign('center');
-						context.setFillStyle('#fc4141');
-						context.fillText('￥' + price, 750 / 2, 900);
-						context.draw(true,function(){
-							uni.canvasToTempFilePath({
-							  destWidth: 750,
-							  destHeight: 1190,
-							  canvasId: 'firstCanvas',
-							  fileType: 'jpg',
-							  success: function(res) {
-								  console.log(res.tempFilePath)
-							    // 在H5平台下，tempFilePath 为 base64
-								uni.hideLoading();
-								successFn && successFn(res.tempFilePath);
-								// that.imagePath = res.tempFilePath;
-								// that.canvasStatus = true;
-							  } 
-							})
-						})
-		            },
-					fail: function(err) {
-						console.log('image失败', err)
-						uni.hideLoading();
-						that.Tips({
-							title: '无法获取图片信息'
-						});
+			src: arr2[0],
+			success: function(res) {
+				const WIDTH = res.width;
+				const HEIGHT = res.height;
+				// ctx.drawImage(arr2[0], 0, 0, WIDTH, 1050);
+				ctx.drawImage(arr2[1], 0, 0, WIDTH, WIDTH);
+				ctx.save();
+				let r = 110;
+				let d = r * 2;
+				let cx = 480;
+				let cy = 790;
+				ctx.arc(cx + r, cy + r, r, 0, 2 * Math.PI);
+				// ctx.clip();
+				ctx.drawImage(arr2[2], cx, cy,d,d);
+				ctx.restore();
+				const CONTENT_ROW_LENGTH = 20;
+				let [contentLeng, contentArray, contentRows] = that.textByteLength(store_name, CONTENT_ROW_LENGTH);
+				if (contentRows > 2) {
+					contentRows = 2;
+					let textArray = contentArray.slice(0, 2);
+					textArray[textArray.length - 1] += '……';
+					contentArray = textArray;
+				}
+				ctx.setTextAlign('left');
+				ctx.setFontSize(36);
+				ctx.setFillStyle('#000');
+				// let contentHh = 36 * 1.5;
+				let contentHh = 36;
+				for (let m = 0; m < contentArray.length; m++) {
+					// ctx.fillText(contentArray[m], 50, 1000 + contentHh * m,750);
+					if (m) {
+						ctx.fillText(contentArray[m], 50, 1000 + contentHh * m + 18,1100);
+					} else {
+						ctx.fillText(contentArray[m], 50, 1000 + contentHh * m,1100);
 					}
-		        });
+				}
+				ctx.setTextAlign('left')
+				ctx.setFontSize(72);
+				ctx.setFillStyle('#DA4F2A');
+				ctx.fillText('￥' + price, 40, 820 + contentHh);
+				
+				ctx.setTextAlign('left')
+				ctx.setFontSize(36);
+				ctx.setFillStyle('#999');
+				ctx.fillText('￥' + ot_price, 50, 876 + contentHh);
+				
+				var underline = function(ctx, text, x, y, size, color, thickness ,offset){ 
+					var width = ctx.measureText(text).width; 
+					 switch(ctx.textAlign){ 
+					 case "center": 
+					 x -= (width/2); break; 
+					 case "right": 
+					 x -= width; break; 
+					 } 
+					
+					 y += size+offset; 
+					
+					 ctx.beginPath(); 
+					 ctx.strokeStyle = color; 
+					 ctx.lineWidth = thickness; 
+					 ctx.moveTo(x,y); 
+					 ctx.lineTo(x+width,y); 
+					 ctx.stroke(); 
+				} 
+				underline(ctx,'￥'+ot_price, 55,865,36,'#999',2,0)
+				ctx.setTextAlign('left')
+				ctx.setFontSize(28);
+				ctx.setFillStyle('#999');
+				ctx.fillText('长按或扫描查看', 490, 1030 + contentHh);
+				ctx.draw(true, function() {
+					uni.canvasToTempFilePath({
+						canvasId: 'firstCanvas',
+						fileType: 'png',
+						destWidth: WIDTH,
+						destHeight: HEIGHT,
+						success: function(res) {
+							uni.hideLoading();
+							successFn && successFn(res.tempFilePath);
+						}
+					})
+				});
+			},
+			fail: function(err) {
+				console.log('失败',err)
+				uni.hideLoading();
+				that.Tips({
+					title: '无法获取图片信息'
+				});
+			}
+		})
 	},
- 	/**
- 	 * 获取分享海报
- 	 * @param array arr2 海报素材
- 	 * @param string store_name 素材文字
- 	 * @param string price 价格
- 	 * @param function successFn 回调函数
- 	 * 
- 	 * 
- 	 */
- 	// PosterCanvas: function(arr2, store_name, price, successFn) {
- 	// 	let that = this;
- 	// 	uni.showLoading({
- 	// 		title: '海报生成中',
- 	// 		mask: true
- 	// 	});
- 	// 	const ctx = uni.createCanvasContext('myCanvas');
- 	// 	ctx.clearRect(0, 0, 0, 0);
- 	// 	/**
- 	// 	 * 只能获取合法域名下的图片信息,本地调试无法获取
- 	// 	 * 
- 	// 	 */
- 	// 	uni.getImageInfo({
- 	// 		src: arr2[0],
- 	// 		success: function(res) {
- 	// 			const WIDTH = res.width;
- 	// 			const HEIGHT = res.height;
-		// 		ctx.drawImage(arr2[0], 0, 0, WIDTH, HEIGHT);
-		// 		ctx.drawImage(arr2[1], 0, 0, WIDTH, WIDTH);
- 	// 			ctx.save();
- 	// 			let r = 90;
- 	// 			let d = r * 2;
- 	// 			let cx = 40;
- 	// 			let cy = 990;
- 	// 			ctx.arc(cx + r, cy + r, r, 0, 2 * Math.PI);
- 	// 			ctx.drawImage(arr2[2], cx, cy,d,d);
- 	// 			ctx.restore();
- 	// 			const CONTENT_ROW_LENGTH = 40;
- 	// 			let [contentLeng, contentArray, contentRows] = that.textByteLength(store_name, CONTENT_ROW_LENGTH);
- 	// 			if (contentRows > 2) {
- 	// 				contentRows = 2;
- 	// 				let textArray = contentArray.slice(0, 2);
- 	// 				textArray[textArray.length - 1] += '……';
- 	// 				contentArray = textArray;
- 	// 			}
- 	// 			ctx.setTextAlign('center');
- 	// 			ctx.setFontSize(32);
- 	// 			let contentHh = 32 * 1.3;
- 	// 			for (let m = 0; m < contentArray.length; m++) {
- 	// 				ctx.fillText(contentArray[m], WIDTH / 2, 820 + contentHh * m);
- 	// 			}
- 	// 			ctx.setTextAlign('center')
- 	// 			ctx.setFontSize(48);
- 	// 			ctx.setFillStyle('red');
- 	// 			ctx.fillText('￥' + price, WIDTH / 2, 880 + contentHh);
-		// 		console.log('787878奋斗奋斗');
-		// 		console.log(res);
- 	// 			ctx.draw(true, function() {
-		// 			console.log('我在测试');
-		// 			console.log(res);
- 	// 				uni.canvasToTempFilePath({
- 	// 					canvasId: 'myCanvas',
- 	// 					fileType: 'png',
- 	// 					destWidth: WIDTH,
- 	// 					destHeight: HEIGHT,
- 	// 					success: function(res) {
-		// 					console.log('3333');
-		// 					console.log(res);
- 	// 						uni.hideLoading();
- 	// 						successFn && successFn(res.tempFilePath);
- 	// 					}
- 	// 				})
- 	// 			});
- 	// 		},
- 	// 		fail: function(err) {
- 	// 			uni.hideLoading();
- 	// 			that.Tips({
- 	// 				title: '无法获取图片信息'
- 	// 			});
- 	// 		}
- 	// 	})
- 	// },
+	
  	/*
  	 * 单图上传
  	 * @param object opt
diff --git a/vue.config.js b/vue.config.js
index 7a03f21d..5d6b7806 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,11 +1,11 @@
 module.exports = {
 	productionSourceMap: true, // 生产打包时不输出map文件，增加打包速度
 	configureWebpack: config => {
-		if (process.env.NODE_ENV === 'production') {
-			config.optimization.minimizer[0].options.terserOptions.compress.warnings = false
-			config.optimization.minimizer[0].options.terserOptions.compress.drop_console = true
-			config.optimization.minimizer[0].options.terserOptions.compress.drop_debugger = true
-			config.optimization.minimizer[0].options.terserOptions.compress.pure_funcs = ['console.log']
-		}
+		// if (process.env.NODE_ENV === 'production') {
+		// 	config.optimization.minimizer[0].options.terserOptions.compress.warnings = false
+		// 	config.optimization.minimizer[0].options.terserOptions.compress.drop_console = true
+		// 	config.optimization.minimizer[0].options.terserOptions.compress.drop_debugger = true
+		// 	config.optimization.minimizer[0].options.terserOptions.compress.pure_funcs = ['console.log']
+		// }
 	}
 }