Merge branches 'developerB' and 'master' of git.caimei365.com:caimei-repository/caimei-applets-caimei into developerB

h5/pages/activity/activity_mid.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

pages.json

@@ -440,6 +440,12 @@
 					"style": {
 						"navigationBarTitleText": "活动名称"
 					}
+				},
+				{
+					"path": "pages/activity/activity_mid",
+					"style": {
+						"navigationBarTitleText": "采美商城年中促销"
+					}
 				}
 			]	
 		},

pages/goods/product.vue

@@ -39,6 +39,7 @@
 							<view v-if="!hasLogin" class="p-login grade  tui-skeleton-fillet">
 								<text class="p-no">价格:</text>
 								<uni-stars :stars="parseInt(product.price1Grade)" :font-size='36' :width-info="180"></uni-stars>
+								<view class="p-minBuy">起订量:<text class="min-text">{{minBuyNumber}}</text></view>
 							</view>
 							<view v-if="!hasLogin" class="p-login tui-skeleton-fillet">
 								<text class="p-login-btn" @click.stop="navToLogin">登录查看价格<text class="iconfont icon-xiayibu" style="font-size: 22rpx;margin: 0 6rpx;"></text></text>

pages/tabBar/cart/cart.vue

@@ -192,7 +192,7 @@
 					if(wxResponse == 1){
 						this.$api.redirectTo('/pages/login/login?type=4')
 					}else{
-						this.$api.navigateTo('/pages/authorization/authorization?type=1')
+						this.$api.navigateTo('/pages/authorization/authorization?type=0')
 					}
 				})	
 			},