commit -m 支付限额修改

components/cm-module/orderDetails/sellerDetaileButton.vue

@@ -5,7 +5,7 @@
 			<view class="btn btn-cancel"  v-if="secondHandOrderFlag!=1"  @click.stop="btnConfirm('again',order)">再来一单</view>
 			<view class="btn btn-cancel" v-if="btnState.isCancel"  @click.stop="btnConfirm('cancel',order)">取消订单</view>
 			<view class="btn btn-cancel" v-if="btnState.isDelete"  @click.stop="btnConfirm('delete',order)">删除订单</view>
-			<view class="btn btn-cancel" @click.stop="onShareCode">
+			<view class="btn btn-share" @click.stop="onShareCode">
 				<view class="tips" v-if="shareCode">分享码：{{shareCode}}</view>
 				分享订单
 			</view>	
@@ -221,15 +221,18 @@
 				background:linear-gradient(315deg,rgba(231,0,0,1) 0%,rgba(255,104,1,1) 100%);
 			}
 			.btn-share{
-				background:linear-gradient(315deg,rgba(0,212,150,1) 0%,rgba(126,243,174,1) 100%);
-				margin-right: 0;
+				background:#FFFFFF;
+				color: #666666;
+				float: left;
+				// margin: 22rpx 0;
+				margin-right: 15rpx;
+				border: 2rpx solid #999999;
 				position: relative;
 				.tips{
 					width: 160rpx;
 					height: 34rpx;
 					padding: 10rpx 10rpx;
-					background:linear-gradient(45deg,rgba(0,0,0,1) 0%,rgba(87,87,87,1) 100%);
-					box-shadow:0px 2px 4px 0px rgba(0,0,0,0.2);
+					background:#E15616;
 					border-radius: 8rpx;
 					position: absolute;
 					color: #FFFFFF;
@@ -237,15 +240,15 @@
 					font-size: $font-size-24;
 					text-align: left;
 					right: 0;
-					top: -65rpx;
+					top: -69rpx;
 					&:before{
 						content: "";
 						width: 25rpx;
 						height: 25rpx;
-						background:linear-gradient(45deg,rgba(0,0,0,1) 0%,rgba(87,87,87,1) 100%);
+						background:#E15616;
 						position: absolute;
 						bottom: -8rpx;
-						right: 30rpx;
+						left: 30rpx;
 						z-index: -1;
 						transform:rotate(45deg);
 					}

pages/user/order/order-pay.vue

@@ -207,8 +207,8 @@
 			},
 			MiniWxPayFor(){
 				authorize.getCode('weixin').then(wechatcode =>{
-					if(this.payAmount > 10000){
-						this.$util.modal('','本次支付金额已超出微信支付限额，请输入小于1万的金额进行支付','知道了','',false,() =>{})
+					if(this.payAmount > 5000){
+						this.$util.modal('','本次支付金额已超出微信支付限额，请输入小于5千的金额进行支付','知道了','',false,() =>{})
 						return
 					}
 					if(this.payAmount == 0){

seller/pages/cart/cart.vue

@@ -303,6 +303,7 @@
 					this.skeletonShow = false
 					this.$store.commit('updateAllNum',response.data.cartQuantity)
 					this.promotionsList = response.data.promotionsList;
+					this.kindCount = response.data.productCount;
 					const resultsData = response.data.pageDate;	
 					if(resultsData.results.length > 0||response.data.invalidProductList.length>0){
 						this.isEmpty =false
@@ -314,7 +315,6 @@
 						this.goodsList = resultsData.results;
 						this.goodsList.forEach((item,index) => {
 							let productsListLength = item.productsList.length,invalidLength = 0;
-							this.kindCount += productsListLength;
 							item.productsList.forEach(pros => {
 								pros.shopID = item.shopID;
 								pros.isStep = false

services/ajax.env.js

@@ -4,8 +4,8 @@ if(process.env.NODE_ENV === 'development'){
 	// URL_CONFIG = 'http://192.168.2.68:8082'	 //涛涛联调地址
 	// URL_CONFIG = 'http://192.168.2.67:8082'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.2.75:8082'	 //超超联调地址
-    URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
-	// URL_CONFIG = 'https://spi.caimei365.com'
+    // URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
+	URL_CONFIG = 'https://spi.caimei365.com'
 }else{
     // 生产环境
 	// URL_CONFIG = 'https://spi-b.caimei365.com'