Merge branch 'master' of http://8.140.253.224:3000/root/school_uni

components/tab-bar/delivery.vue

@@ -211,6 +211,7 @@
 								style="transform: scale(0.7);text-align: right;" />
 						</view>
 					</view>
+					<scroll-view scroll-y="true" style="max-height: 660rpx;">
 						<view style="height: 50rpx;line-height: 50rpx;font-weight: 700;display: flex;">
 							外卖规则
 							<view @tap="allCheck('waimai')" v-if="zhipaiCheck" style="color: #1E90FF;flex:1;text-align: right;padding-right: 20rpx;">
@@ -281,8 +282,14 @@
 									style="margin-left:5px;"></uni-icons> -->
 							</view>
 						</view>
+					</scroll-view>
+					<view style="display: flex;position: absolute;bottom: 0;width: 93%;">
 						<view class="btn" @tap="selectRule">
-						确认修改
+							确认规则
+						</view>
+						<view class="btn" @tap="buchong">
+							补充规则
+						</view>
 					</view>
 				</view>
 			</uni-popup>
@@ -509,6 +516,13 @@
 				this.productData = item.goodsList;
 				this.$refs.productPopup.open()
 			},
+			buchong(){
+				this.$refs.carPopup.close()
+				uni.navigateTo({
+					url:'/package1/myCenter/partTimeJobRegister'
+				})
+				
+			},
 			selectRule(item) {
 				//TODO 这里应该改成 复选，选中的遍历再放进来
 				// let rule = {
@@ -907,11 +921,12 @@
 
 	.guize-list {
 		width: 600rpx;
-		padding: 20rpx;
+		    padding: 20rpx 20rpx 0;
-		overflow: scroll;
 		background: #fff;
 		border-radius: 20rpx;
 		    max-height: 1000rpx;
+		    min-height: 640rpx;
+			position: relative;
 	}
 
 	.zhipai-box {
@@ -995,7 +1010,8 @@
 		border-radius: 100rpx;
 		line-height: 100rpx;
 		text-align: center;
-		margin: 40rpx auto;
+		    margin: 20rpx 20rpx;
+			flex: 1;
 	}
 	.code-box{
 		display: inline-block;

components/tab-bar/tab-bar.vue

@@ -197,7 +197,7 @@
 		background: rgba(255, 255, 255, 1);
 		margin: 0 auto;
 		display: flex;
-		z-index: 999;
+		z-index: 9;
 		border-top: 1px solid #eee;
 		border-top-left-radius: 60rpx;
 		border-top-right-radius: 60rpx;

package1/group/groupBuySingle.vue

@@ -1499,9 +1499,9 @@
 			},
 			goDetail(type) {
 				if (type == 'goodsDetail') {
-					uni.navigateTo({
+					// uni.navigateTo({
-						url: '/package1/goods/goodsDetail'
+					// 	url: '/package1/goods/goodsDetail'
-					})
+					// })
 				} else if (type == 'shopDetail') {
 					uni.navigateTo({
 						url: '/package1/group/groupBuyDetail?item=' + JSON.stringify(this.shopItem)

package1/runErrand/runErrand.vue

@@ -242,7 +242,7 @@
 				<view>￥{{totalAmountCalc.toFixed(2)}}</view>
 			</view>
 			
-			<view style="width: 100%;height: 400rpx;"></view>
+			<view style="width: 100%;height: 520rpx;"></view>
 		</view>
 		
 		<view class="buy-bottom">

pages/index/index.vue

@@ -458,7 +458,7 @@
 			</view>
 		</view>
 		<!-- 弹出区域选择 -->
-		<uni-popup ref="areaPopup" background-color="#fff">
+		<uni-popup ref="areaPopup" :is-mask-click="false" background-color="#fff">
 			<view class="popup-area-content">
 				<view class="popup-area-title">
 					<text>请选择 所属区域</text>
@@ -2333,6 +2333,8 @@
 		justify-content: center;
 		height: auto;
 		background-color: #fff;
+		    padding: 10px 20px;
+		    border-radius: 10px;
 	}
 
 	.popup-area-title {
@@ -2353,6 +2355,7 @@
 		border-bottom: 1px solid #eee;
 		border-top: 1px solid #eee;
 		color: #fff;
+		    padding: 0 10px;
 	}
 
 	.chaoda {