Merge branch 'master' of http://140.143.224.240:8100/hooloo/mp/user

App.vue

@@ -11,6 +11,18 @@ export default {
     	navigationBarHeight: 0, // 导航栏高度(标题栏高度)
 	},
 	onLaunch: function () {
+		wx.setInnerAudioOption({
+ 		   mixWithOther: true,
+ 		   obeyMuteSwitch: false,
+ 		   success: function (e) {
+ 		     console.log(e)
+ 		     console.log('play success')
+ 		   },
+ 		   fail: function (e) {
+ 		     console.log(e)
+ 		     console.log('play fail')
+ 		   }
+ 		})
 		Store.commit('setAuthorization', uni.getStorageSync('Authorization'))
 		Store.commit('setUserInfo', uni.getStorageSync('userInfo'))
 		// uni.showLoading({

components/menuAssembly/index.vue

@@ -9,7 +9,7 @@
 		</scroll-view>
 		<scroll-view class="nav-right" :style="[heightStyle]" :class="[shopCarFlag?'shopCarcss':'' ]" scroll-y :scroll-top="scrollTop" @scroll="scroll" @touchstart="openScroll"
 			scroll-with-animation>
-			<view v-for="category in classifyData" :id="category.id" :key="category.id" class="box">
+			<view v-for="(category,index) in classifyData" :id="category.id" :key="category.id" class="box" :style="[goodBottom]">
 				<view :style="loads" class="right-title">{{ category.name }}</view>
 				<view class="nav-right-item" v-for="item in category.goods" :key="item.goodsId">
 					<view class="thumbnailBox">
@@ -55,6 +55,9 @@ export default {
 			heightStyle: {
 				'--scroll-height': 0
 			},
+			goodBottom: {
+				'--good-bottom':0
+			},
 			Utils,
 			categoryId: '',
 			categoryPostion: [],
@@ -63,7 +66,8 @@ export default {
 			scrolled: true,
 			goods:[],
 			shopCarFlag:false,
-			taBarHeight:0
+			taBarHeight:0,
+			lastNumber:0
 		}
 	},
 	watch:{
@@ -80,7 +84,13 @@ export default {
 	},
 	computed:{
 		classifyData(){
-			const categorys = JSON.parse(JSON.stringify(this.$store.state.menu.setMenuCategorys))
+			let categorys = this.$store.state.menu.setMenuCategorys.length!=0?JSON.parse(JSON.stringify(this.$store.state.menu.setMenuCategorys)):[]
+			// if(categorys.length!=0){
+			// 	const lastGood = 1
+			// 	this.lastNumber = lastGood<=2?3-lastGood:0
+			// 	this.goodBottom['--good-bottom'] = ((this.lastNumber*50))+'px'
+			// 	console.log(this.lastNumber)
+			// }
 			// 删除没有商品的分类
 			if(categorys) {
 				for(var i=categorys.length-1; i>=0; i--) {
@@ -93,6 +103,8 @@ export default {
 					this.categoryId = categorys[0].id;
 				}
 			}
+
+
 			this.$nextTick(() => {
 				const query = uni.createSelectorQuery().in(this);
 				query.selectAll('.box').boundingClientRect(data => {
@@ -409,8 +421,10 @@ export default {
 }
 
 .box:last-child{
-	padding-bottom: 255rpx;
+	// padding-bottom: var(--good-bottom);
+	padding-bottom: 200rpx;
 	// height: 100%;
+
 }
 
 .nav-right-item image {

components/shopCar/shopCar.vue

 <template>
 	<view>
 		<u-popup :show="showShopCar && goods.length" mode="bottom" :round="5" :overlay="true"
-			:closeOnClickOverlay="true" @close="closeT">
+			:closeOnClickOverlay="true" @close="closeT" zIndex="10071">
 			<view class="shop-car" :style="{'padding-bottom':bottomPadding+'rpx'}">
 				<view class="header">
 					<text class="left">购物袋</text>
@@ -494,7 +494,7 @@ export default {
 	left: 0;
 	box-shadow: 0px -4px 8px 0px rgba(102, 102, 102, 0.1);
 	display: flex;
-	z-index: 10076;
+	z-index: 10072;
 	align-items: center;
 
 	&-left {

components/tabBar/tabBar.vue

@@ -74,7 +74,7 @@
 		left: 0;
 		width: 100%;
 		height: 100rpx;
-		z-index: 10076;
+		z-index: 10072;
 		background: #FFFFFF;
 		border-top: 2rpx solid #FFFFFF;
 	}

menuSubPackage/pages/goodsDetail/goodsDetail.vue

@@ -526,8 +526,8 @@ export default {
 }
 
 button[disabled]:not([type]) {
-	background: url('@/static/imgs/shouqingsku.png') center center no-repeat;
-	background-size: 100%;
+	background: url('@/static/imgs/shouqingsku.png') no-repeat;
+	background-size: 100% 48rpx;
 }
 
 .spec-detail {

orderSubPackage/pages/orderInfo/index.vue

@@ -161,6 +161,9 @@ export default {
 		}
 		this.isBuild = isBuild
 	},
+	onUnload(){
+		this.goBack()
+	},
 	data() {
 		return {
 			orderInfo: {},
@@ -211,9 +214,13 @@ export default {
 		},
 		async PayNow() {
 			const orderInfo = await Order.payOrder({ orderId: this.orderInfo.id })
+			const sendData = {
+				orderId: this.orderInfo.id,
+				...orderInfo.data.data
+			}
 			if (orderInfo) {
 				if (orderInfo && orderInfo.data.code == 200) {
-					await Menu.requestPayment(orderInfo.data.data);
+					await Menu.requestPayment(sendData);
 				}
 			}
 		},

pages/order/order.vue

@@ -189,9 +189,13 @@ export default {
 		},
 		async PayNow({ id }) {
 			const orderInfo = await order.payOrder({ orderId: id })
+			const sendData = {
+				orderId:id,
+				...orderInfo.data.data
+			}
 			if (orderInfo) {
 				if (orderInfo && orderInfo.data.code == 200) {
-					await Menu.requestPayment(orderInfo.data.data);
+					await Menu.requestPayment(sendData);
 					this.getList()
 				}
 			}