소스 검색

Merge branch 'master' of http://git.cc-lotus.info/pointToNetwork/point-app

guhongwei 2 년 전
부모
커밋
4cd4a15db6
1개의 변경된 파일34개의 추가작업 그리고 8개의 파일을 삭제
  1. 34 8
      pagesHome/order/order.vue

+ 34 - 8
pagesHome/order/order.vue

@@ -59,13 +59,6 @@
 										</view>
 										<view class="other_2" v-else>包邮</view>
 									</view>
-									<view class="other">
-										<view class="other_1">优惠劵</view>
-										<view class="other_2" @click="toCoupon" v-if="couponList.length">
-											{{coupon_name||'请选择优惠劵'}}
-										</view>
-										<view class="other_2" v-else>暂无优惠劵使用</view>
-									</view>
 									<view class="other">
 										<view class="other_1">订单备注</view>
 										<view class="other_3">
@@ -74,6 +67,13 @@
 									</view>
 								</view>
 							</view>
+							<view class="other">
+								<view class="other_1">优惠劵</view>
+								<view class="other_2" @click="toCoupon" v-if="couponList.length">
+									{{coupon_name||'请选择优惠劵'}}
+								</view>
+								<view class="other_2" v-else>暂无优惠劵使用</view>
+							</view>
 						</view>
 					</view>
 				</scroll-view>
@@ -119,7 +119,7 @@
 					</view>
 				</scroll-view>
 			</view>
-			<view class="content" v-else>
+			<view class="content" v-else-if="type=='1'">
 				<scroll-view scroll-y="true" class="scroll-view">
 					<discount :Style="Style" :couponList="couponList" @toDiscount="toDiscount"></discount>
 				</scroll-view>
@@ -470,6 +470,32 @@
 						}
 					}
 				}
+
+				.other {
+					display: flex;
+					justify-content: space-between;
+					background-color: var(--mainColor);
+					border-bottom: 0.1vw solid var(--fcColor);
+					margin: 0 0 2vw 0;
+					width: 96vw;
+					padding: 2vw;
+
+					.other_1 {
+						font-size: var(--font16Size);
+						color: var(--f85Color);
+					}
+
+					.other_3 {
+						flex-grow: 1;
+						margin: 0 0 0 2vw;
+						font-size: var(--font12Size);
+					}
+
+					text {
+						padding: 0 1vw 0 0;
+						font-size: var(--font20Szie);
+					}
+				}
 			}
 		}