圣诞快乐

# v1.3 更新列表 1. 【新增】砍价 2. 【新增】拼团 3. 【新增】一号通 4. 【修复】商品sku 编辑时出现商品属性对应错误的问题 5. 【修复】商品推广海报生成二维码可能会出错的问题【小程序调试中】 6. 【修复】微信公众号和小程序头像可能获取不到的问题 7. 【修复】下单时可能会出错的问题 8. 【修复】pc管理端用户访问量 9. 【修复】微信退款 10. 【修复】管理端订单状态可能出现不正确的情况 11. 【修复】WEB管理端-菜单色调，短信API更新，首页用户访问量，系统设置tab是自动选择下一及表单 12. 【修复】系统设置出现更新不正确的问题
2020-12-23 15:56:45 +08:00
parent f3975936c2
commit 0d32da772d
768 changed files with 40200 additions and 46123 deletions
--- a/app/components/countDown/index.vue
+++ b/app/components/countDown/index.vue
@@ -68,7 +68,7 @@

 				function runTime() {
 					//时间函数
-					let intDiff = that.datatime - Date.parse(new Date()) / 1000; //获取数据中的时间戳的时间差；
+					let intDiff = that.datatime - Date.parse(new Date())/1000; //获取数据中的时间戳的时间差；
 					let day = 0,
 						hour = 0,
 						minute = 0,
--- a/app/components/couponListWindow/备份.vue
+++ b/app/components/couponListWindow/备份.vue
@@ -30,7 +30,7 @@
 			</view>
 			<!-- 无优惠券 -->
 			<view class='pictrue' v-else>
-				<image src='/static/images/noCoupon.png'></image>
+				<image src='../../static/images/noCoupon.png'></image>
 			</view>
 		</view>
 		<view class='mask' catchtouchmove="true" :hidden='coupon.coupon==false' @click='close'></view>
--- a/app/components/easy-upload/easy-upload.vue
+++ b/app/components/easy-upload/easy-upload.vue
@@ -161,7 +161,6 @@
 				});
 			},
 			upload(){
-				debugger
 				if(!this.uploadUrl) {
 					uni.showModal({
 						content: '请填写上传接口'
--- a/app/components/emptyPage.vue
+++ b/app/components/emptyPage.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="empty-box">
-		<image src="/static/images/empty-box.png"></image>
+		<image src="../static/images/empty-box.png"></image>
 		<view class="txt">{{title}}</view>
 	</view>
 </template>
--- a/app/components/payment/index.vue
+++ b/app/components/payment/index.vue
@@ -77,8 +77,12 @@
 					'from': 'routine',
 					// #endif
 					// #ifdef H5 || APP-PLUS
-					'from': this.$wechat.isWeixin() ? 'weixin' : 'weixinh5',
+					'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
 				}).then(res => {
 					switch (paytype) {
 						case 'weixin':
@@ -87,11 +91,11 @@
 							});
 							// #ifdef MP || APP-PLUS
 							let jsConfig = res.data.jsConfig;
-							let packages = 'prepay_id=' + jsConfig.prepayId;
+							// let packages = 'prepay_id=' + jsConfig.prepayId;
 							uni.requestPayment({
 								timeStamp: jsConfig.timeStamp.toString(),
 								nonceStr: jsConfig.nonceStr,
-								package: packages,
+								package: jsConfig.package,
 								signType: jsConfig.signType,
 								paySign: jsConfig.paySign,
 								success: function(res) {
@@ -128,30 +132,18 @@
 							});
 							// #endif
 							// #ifdef H5
-							let data = res.data;
-							if (data.status == "WECHAT_H5_PAY") {
-								uni.hideLoading();
-								location.replace(data.result.jsConfig.h5PayUrl);
-								return that.$util.Tips({
-									title: "支付成功",
-									icon: 'success'
-								}, () => {
-									that.$emit('onChangeFun', {
-										action: 'pay_complete'
-									});
-								});
-							} else {
-								let jsConfig = data.result.jsConfig;
-								let packages = 'prepay_id=' + jsConfig.prepayId;
-								let data = {
+							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:packages,
+									package:jsConfig.package,
 									signType:jsConfig.signType,
 									paySign:jsConfig.paySign
 								};
-								that.$wechat.pay(data)
-									.finally(() => {
+								that.$wechat.pay(datas)
+									.then(() => {
 										return that.$util.Tips({
 											title: "支付成功",
 											icon: 'success'
@@ -166,6 +158,17 @@
 											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;
--- a/app/components/productWindow/index.vue
+++ b/app/components/productWindow/index.vue
@@ -53,7 +53,7 @@
 			<view class="joinBnt bg-color" v-if="iSbnt && attr.productSelect.stock>0 &&attr.productSelect.quota>0" @click="goCat">我要参团</view>
 			<view class="joinBnt on" v-else-if="(iSbnt && attr.productSelect.quota<=0)||(iSbnt &&attr.productSelect.stock<=0)">已售罄</view>
 			<view class="joinBnt bg-color" v-if="iScart && attr.productSelect.stock" @click="goCat">确定</view>
-			<view class="joinBnt bg-color" v-if="iSbnt && attr.productSelect.stock && attr.productSelect.quota" @click="goCat">确定</view>
+			<!-- <view class="joinBnt bg-color" v-if="iSbnt && attr.productSelect.stock && attr.productSelect.quota" @click="goCat">确定</view> -->
 			<view class="joinBnt on" v-else-if="(iScart && !attr.productSelect.stock)">已售罄</view>
 		</view>
 		<view class="mask" @touchmove.prevent :hidden="attr.cartAttr === false" @click="closeAttr"></view>
--- a/app/components/userEvaluation/index.vue
+++ b/app/components/userEvaluation/index.vue
@@ -5,12 +5,16 @@
 				<view class="pictrue">
 					<image :src="item.avatar"></image>
 				</view>
-				<view class="acea-row row-middle">
-					<view class="name line1">{{ item.nickname }}</view>
-					<view class="start" :class="'star' + Math.round((item.productScore+item.serviceScore)/2)"></view>
+				<view class="acea-row row-between-wrapper" style="width: 87%;">
+					<view class="acea-row row-middle">
+						<view class="name line1">{{ item.nickname }}</view>
+						<view class="start" :class="'star' + item.productScore"></view>
+					</view>
+					<view class="time">{{ item.createTime }}</view>
+					<!-- <view class="time">{{ item.createTime }} {{ item.suk }}</view> -->
 				</view>
+				
 			</view>
-			<view class="time">{{ item.createTime }} {{ item.suk }}</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">
@@ -51,75 +55,74 @@
 		background-color: #fff;
 		padding-bottom: 25rpx;
 	}
-
+	
 	.evaluateWtapper .evaluateItem~.evaluateItem {
 		border-top: 1rpx solid #f5f5f5;
 	}
-
+	
 	.evaluateWtapper .evaluateItem .pic-text {
 		font-size: 26rpx;
 		color: #282828;
 		height: 95rpx;
 		padding: 0 30rpx;
 	}
-
+	
 	.evaluateWtapper .evaluateItem .pic-text .pictrue {
 		width: 56rpx;
 		height: 56rpx;
 		margin-right: 20rpx;
 	}
-
+	
 	.evaluateWtapper .evaluateItem .pic-text .pictrue image {
 		width: 100%;
 		height: 100%;
 		border-radius: 50%;
-		background: #f4f4f4;
 	}
-
+	
 	.evaluateWtapper .evaluateItem .pic-text .name {
 		max-width: 450rpx;
-		margin-right: 15rpx;
 	}
-
+	
 	.evaluateWtapper .evaluateItem .time {
 		font-size: 24rpx;
 		color: #82848f;
 		padding: 0 30rpx;
 	}
-
+	
 	.evaluateWtapper .evaluateItem .evaluate-infor {
 		font-size: 28rpx;
 		color: #282828;
 		margin-top: 19rpx;
 		padding: 0 30rpx;
 	}
-
+	
 	.evaluateWtapper .evaluateItem .imgList {
 		padding: 0 30rpx 0 15rpx;
 		margin-top: 25rpx;
 	}
-
+	
 	.evaluateWtapper .evaluateItem .imgList .pictrue {
 		width: 156rpx;
 		height: 156rpx;
 		margin: 0 0 15rpx 15rpx;
 	}
-
+	
 	.evaluateWtapper .evaluateItem .imgList .pictrue image {
 		width: 100%;
 		height: 100%;
+		background-color: #f7f7f7;
 	}
-
+	
 	.evaluateWtapper .evaluateItem .reply {
 		font-size: 26rpx;
 		color: #454545;
 		background-color: #f7f7f7;
 		border-radius: 5rpx;
 		margin: 20rpx 30rpx 0 30rpx;
-		padding: 30rpx;
+		padding: 20rpx;
 		position: relative;
 	}
-
+	
 	.evaluateWtapper .evaluateItem .reply::before {
 		content: "";
 		width: 0;
@@ -128,7 +131,7 @@
 		border-right: 20rpx solid transparent;
 		border-bottom: 30rpx solid #f7f7f7;
 		position: absolute;
-		top: -30rpx;
+		top: -14rpx;
 		left: 40rpx;
 	}
 </style>