xiaoxin 9 månader sedan
förälder
incheckning
3513968db2
4 ändrade filer med 48 tillägg och 21 borttagningar
  1. 16 12
      components/colorui/main.css
  2. 24 9
      my/address/add.vue
  3. 4 0
      pages/index/shop/payOrder.vue
  4. 4 0
      pages/order/takefood.vue

+ 16 - 12
components/colorui/main.css

@@ -331,10 +331,10 @@ checkbox.green.checked .uni-checkbox-input,
 checkbox.checked .uni-checkbox-input,
 radio.green.checked .uni-radio-input,
 radio.checked .uni-radio-input {
-	background-color: #39b54a !important;
-	border-color: #39b54a !important;
+	background-color: #5D9188 !important;
+	border-color: #5D9188 !important;
 	color: #ffffff !important;
-	border-color: #39B54A !important;
+	border-color: #5D9188 !important;
 }
 
 switch.cyan[checked] .wx-switch-input,
@@ -2498,11 +2498,13 @@ button.cuIcon.lg {
 .cu-modal.drawer-modal.show .cu-dialog {
 	transform: translateX(0%);
 }
-.cu-modal .cu-dialog>.cu-bar:first-child .action{
-  min-width: 100rpx;
-  margin-right: 0;
-  min-height: 100rpx;
+
+.cu-modal .cu-dialog>.cu-bar:first-child .action {
+	min-width: 100rpx;
+	margin-right: 0;
+	min-height: 100rpx;
 }
+
 /* ==================
          轮播
  ==================== */
@@ -2932,11 +2934,13 @@ scroll-view.cu-steps .cu-item {
 	position: relative;
 	overflow: hidden;
 }
+
 .grid.grid-square>view.bg-img image {
 	width: 100%;
 	height: 100%;
 	position: absolute;
 }
+
 .grid.col-1.grid-square>view {
 	padding-bottom: 100%;
 	height: 0;
@@ -3350,7 +3354,7 @@ scroll-view.cu-steps .cu-item {
 
 .line-green::after,
 .lines-green::after {
-	border-color: #39b54a;
+	border-color: #5D9188;
 }
 
 .line-cyan::after,
@@ -3424,7 +3428,7 @@ scroll-view.cu-steps .cu-item {
 }
 
 .bg-green {
-	background-color: #39b54a;
+	background-color: #5D9188;
 	color: #ffffff;
 }
 
@@ -3509,7 +3513,7 @@ scroll-view.cu-steps .cu-item {
 }
 
 .bg-green.light {
-	color: #39b54a;
+	color: #5D9188;
 	background-color: #d7f0dbff;
 }
 
@@ -3559,7 +3563,7 @@ scroll-view.cu-steps .cu-item {
 }
 
 .bg-gradual-green {
-	background-image: linear-gradient(45deg, #39b54a, #8dc63f);
+	background-image: linear-gradient(45deg, #5D9188, #8dc63f);
 	color: #ffffff;
 }
 
@@ -3909,4 +3913,4 @@ scroll-view.cu-steps .cu-item {
 .line-white,
 .lines-white {
 	color: #ffffff;
-}
+}

+ 24 - 9
my/address/add.vue

@@ -17,6 +17,17 @@
 			
 			<view v-if="form.isInner">
 				<view class="cu-form-group">
+					<view class="title">选择骑手站点</view>
+					<view style="width: 50vw;text-align: end;">
+						<picker style="padding-right: 0;" @change="bindPickerChange_station" :value="stationIndex" :range="stationList">
+							<view :style="stationIndex==null?'color:#aaa':''">
+								{{stationIndex==null?"请选择骑手站点":stationList[stationIndex]}}
+							</view>
+						</picker>
+					</view>
+				</view>
+				
+				<view class="cu-form-group">
 					<view class="title">选择地址</view>
 					<view style="width: 50vw;text-align: end;">
 						<picker style="padding-right: 0;" @change="bindPickerChange" :value="addressIndex" :range="addressList">
@@ -28,14 +39,14 @@
 				</view>
 				<view class="cu-form-group">
 					<view class="title">当前特殊地址跑腿费:</view>
-					<view >
+					<view style="color: #5E9289;">
 						¥1.00
 					</view>
 				</view>
 				<view class="cu-form-group">
 					<view class="title">备注信息</view>
-					<view style="width: 50vw; border: 2rpx solid #aaa;border-radius: 12rpx;">
-						<textarea style="margin: 0; padding: 8rpx;" auto-height />
+					<view style="width: 60vw;height: 200rpx;border-radius: 12rpx;background-color: #F5F5F5;">
+						<textarea style="margin: 0; padding: 12rpx;height: 200rpx;"/>
 					</view>
 				</view>
 			</view>
@@ -91,7 +102,6 @@
 					lat: '',
 					isInner:false
 				},
-				// switchA: false,
 				region: '',
 
 				id: '',
@@ -101,6 +111,8 @@
 				content: '',
 				addressList: ['中国', '美国美国美国美国美国美国美国美国美国美国美国美', '巴西', '日本'],
 				addressIndex: null,
+				stationList: ['黄家湖', '墨轩湖'],
+				stationIndex: null,
 			}
 		},
 		onLoad(option) {
@@ -124,6 +136,9 @@
 			}
 		},
 		methods: {
+			bindPickerChange_station(e){
+				this.stationIndex = e.detail.value
+			},
 			bindPickerChange(e){
 				this.addressIndex = e.detail.value
 				this.form.address = this.addressList[this.addressIndex]
@@ -196,7 +211,7 @@
 				});
 			},
 			SwitchA(e) {
-				console.log(e.detail.value)
+				// console.log(e.detail.value)
 				this.form.addressDefault = e.detail.value
 			},
 			// 选择地区回调
@@ -361,8 +376,8 @@
 
 	/* 添加收货地址 */
 	.btn {
-		/* position: fixed;
-		bottom: 0rpx; */
+		position: fixed;
+		bottom: 100rpx;
 		width: 100%;
 		height: 100rpx;
 		line-height: 100rpx;
@@ -374,11 +389,11 @@
 		width: 90%;
 		height: 80rpx;
 		margin: 0 auto;
-		background: #FCD202;
-		border-radius: 20rpx;
+		border-radius: 100rpx;
 		color: white;
 		text-align: center;
 		line-height: 80rpx;
 		font-size: 35rpx;
+		background: linear-gradient(90deg, #5D9188 0%, #71A296 100%);
 	}
 </style>

+ 4 - 0
pages/index/shop/payOrder.vue

@@ -100,6 +100,10 @@
 				<view>跑腿费</view>
 				<view class="tosend_header_do_ri">¥{{ paotuiMoney }}</view>
 			</view>
+			<view class="tosend_header_do justify-between" v-if="paotuiMoney > 0 && orderType == 2">
+				<view>特殊地址跑腿费</view>
+				<view class="tosend_header_do_ri">¥0</view>
+			</view>
 			<view class="tosend_header_do justify-between do_bot" @click="isShow">
 				<view>优惠券</view>
 				<view class="tosend_header_do_ri" v-if="coupon">- ¥{{ coupon.money }}</view>

+ 4 - 0
pages/order/takefood.vue

@@ -100,6 +100,10 @@
 					<view>跑腿费</view>
 					<view class="tosend_header_do_ri">¥{{ dataDet.errandMoney }}</view>
 				</view>
+				<view class="tosend_header_do do_bot">
+					<view>特殊地址跑腿费</view>
+					<view class="tosend_header_do_ri">¥0</view>
+				</view>
 				<view class="tosend_header_do">
 					<view class="tosend_header_do_le2">实付</view>
 					<view class="tosend_header_do_ri2">