Merge remote-tracking branch 'remotes/origin/developer' into developerA

pages/seller/cart/cart.vue

@@ -273,11 +273,11 @@
 			:skuProduct="handlePros"
 			@skuBtnConfirm="handleBtnConfirm"
 			@handleFuction="handleFuctionData"
-		></cm-unit-popup>
+		/>
 		<!-- 促销活动弹窗 -->
-		<activi-popup :product="handlerPros" :popupShow="popupShow1"></activi-popup>
+		<activi-popup :product="handlerPros" :popupShow="popupShow1" />
 		<!-- 透明模态层 -->
-		<modal-layer v-if="modallayer"></modal-layer>
+		<modal-layer v-if="modallayer" />
 	</view>
 </template>
 <script>
@@ -294,7 +294,7 @@ const defaultListQuery = {
 	serviceProviderId: 0, //协销Id
 	againBuyProductIds: '', // 再次购买商品ids
 	pageNum: 1, // 页码
-	pageSize: 10 // 条数
+	pageSize: 50 // 条数
 }
 export default {
 	mixins: [apisMixins, cartMixins],
@@ -1053,13 +1053,13 @@ export default {
 			this.handlePros = pros
 		}
 	},
-	onReachBottom() {
-		if (this.hasNextPage) {
-			this.loadding = true
-			this.pullUpOn = true
-			this.getOnReachBottomData()
-		}
-	},
+	// onReachBottom() {
+	// 	if (this.hasNextPage) {
+	// 		this.loadding = true
+	// 		this.pullUpOn = true
+	// 		this.getOnReachBottomData()
+	// 	}
+	// },
 	onPullDownRefresh() {
 		//下拉刷新
 		this.initGetCartGoodsList()

pages/seller/cart/components/cm-unit-popup.vue

@@ -267,6 +267,9 @@ export default {
 					this.$util.msg('购买量必须为起订量的整数倍', 2000)
 					this.productCount = this.handleMinNumber
 					return
+				}else{
+					this.addParams.productCount = this.productCount
+					this.handleAddClubCart(this.addParams)
 				}
 			}else{
 				this.addParams.productCount = this.productCount

services/config.env.js

@@ -5,8 +5,8 @@ if(process.env.NODE_ENV === 'development'){
     // URL_CONFIG = 'http://192.168.2.68:18002'	 //涛涛联调地址
     // URL_CONFIG = 'http://192.168.2.102:18002' //志国联调地址
     // URL_CONFIG = 'http://192.168.2.103:18002'    //陈凯联调地址
-    URL_CONFIG = 'https://core-b.caimei365.com'
-    // URL_CONFIG = 'https://core.caimei365.com'    
+    // URL_CONFIG = 'https://core-b.caimei365.com' 
+    URL_CONFIG = 'https://core.caimei365.com'    
 }else{
     // 生产环境
     // URL_CONFIG = 'https://core-b.caimei365.com'