Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

pages/address/address2.vue

@@ -2,7 +2,7 @@
 	<view style="position: relative;" class="view-box">
 		<view class="box">
 			<view class="box-img">
-				<image style="width: 100rpx height: 50rpx;;" src='https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653464014000_713.png' mode="aspectFill"></image>
+				<image style="width: 100rpx; height: 50rpx;;" src='https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653464014000_713.png' mode="aspectFill"></image>
 			</view>
 			<view class="box-bg">
 				<input class="uni-input inputM" style='margin-left: 10px;margin-top: 5px;' v-model="rules.StuName"
@@ -342,8 +342,8 @@
 		justify-content: center;
 		font-size: 22rpx;
 		color: #fff;
-		position: absolute;
-		bottom: 250rpx;
+		position: fixed;
+		bottom: 190rpx;
 		left: 50%;
 		transform: translate(-50%, 0%);
 		background-color: #138BF9;

pages/order-submit/order-submit2.vue

@@ -309,6 +309,9 @@
 						</view>
 					</view>
 				</scroll-view>
+				<view class="determine-box">
+					<view :style="{ 'background-color': mc }" class="determine-box2" @click="determine()">确定</view>
+				</view>
 			</view>
 		</u-popup>
 	</view>
@@ -332,6 +335,7 @@
 			return {
 				isAlipay: 2,
 				JJSWStuId:"",
+				Thename2:'',
 				u:{},
 				Thename: '姓名',
 				actuve: 0,
@@ -466,9 +470,13 @@
 			},
 			masklist(item, i) {
 				this.actuve = i
-				this.Thename = item.StuName
+				this.Thename2 = item.StuName
 				this.JJSWStuId = item.StuId
 			},
+			determine() {
+				this.Thename = this.Thename2
+				this.show = false
+			},
 			onShareAppMessage() {
 				return {
 					title: this.zrName,
@@ -828,6 +836,24 @@
 </script>
 
 <style>
+	.determine-box{
+		    margin: auto;
+		    height: 80rpx;
+		    font-size: 28rpx;
+		    display: flex;
+		    justify-content: center;
+		    align-items: center;
+			margin-top: 50rpx;
+	}
+	.determine-box2 {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		width: 60%;
+		border-radius: 50rpx;
+		color: #fff;
+		height: 80rpx;
+	}
 	.mask-lit22{
 		width: 50rpx;
 		    height: 50rpx;
@@ -859,27 +885,27 @@
 	}
 
 	.mask-lit33 {
-		font-size: 22rpx;
+		font-size: 28rpx;
 		color: black;
 	}
 
 	.mask-lit3 {
-		font-size: 22rpx;
+		font-size: 28rpx;
 		color: black;
 		font-weight: bold;
 	}
 
 	.mask-lit2 {
-		font-size: 24rpx;
+		font-size: 28rpx;
 		display: inline-block;
 		margin-right: 20rpx;
 		border-radius: 50%;
 		/* background-color: red; */
-		width: 40rpx;
-		height: 40rpx;
+		width: 50rpx;
+		height: 50rpx;
 		/* display: flex; */
 		text-align: center;
-		line-height: 40rpx;
+		line-height: 50rpx;
 		color: #FFF;
 	}