Browse Source

页面优化

shish 7 tháng trước cách đây
mục cha
commit
6cfb011573

+ 8 - 1
mallApp/src/pages/billing/affirmGhs.vue

@@ -67,9 +67,16 @@
 							<text v-if="account == 4805" style="color: #3385FF;width:100%;">
 							需要送货上门,运费另付,下单后请联系客服
 							</text>
-							<text v-else style="color: #3385FF;width:100%;">到店取货,没有配送费</text>
 						</view>
 					</tui-list-cell>
+					<tui-list-cell class="line-cell" :hover="false" v-if="form.sendType == 2 || form.sendType == 0">
+						<div class="tui-title">收花人姓名</div>
+						<input v-model="form.receiveUserName" placeholder-class="phcolor" placeholder-style="color:#ccc" @blur="onInputBlur" class="tui-input" name="receiveUserName" placeholder="请填写姓名" />
+					</tui-list-cell>
+					<tui-list-cell class="line-cell" :hover="false" v-if="form.sendType == 2 || form.sendType == 0">
+						<div class="tui-title">收花人电话</div>
+						<input v-model="form.receiveMobile" placeholder-class="phcolor" placeholder-style="color:#ccc" @blur="onInputBlur" class="tui-input" name="receiveMobile" placeholder="请填写电话" type="number" />
+					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false" :arrow="true" v-if="form.sendType == 2 || form.sendType == 0" @click="modifyAddress">
 						<view class="tui-title">收花地址</view>
 						<view v-if="!$util.isEmpty(userInfo.lat) && !$util.isEmpty(userInfo.long)">

+ 26 - 4
mallApp/src/pages/home/category.vue

@@ -23,8 +23,7 @@
 			<view 
 				v-for="(filterItem, filterIndex) in filterTabs" 
 				:key="filterIndex"
-				class="filter-tab-item"
-				:class="{ 'active': currentFilterTab === filterIndex }"
+        :class="[filterItem.value == 99 ? 'filter-tab-item-tb':'filter-tab-item',currentFilterTab === filterIndex?'active':'']"
 				@click="switchFilterTab(filterIndex)"
 			>
 				<text>{{ filterItem.name }}</text>
@@ -657,13 +656,36 @@ page {
 	display: flex;
 	align-items: center;
 	justify-content: center;
-	
 	&.active {
 		background-color: #ff4757;
 		color: #fff;
 		border-color: #ff4757;
 	}
-	
+	&:active {
+		opacity: 0.8;
+	}
+}
+.filter-tab-item-tb {
+	padding: 18upx 48upx;
+	border-radius: 50upx;
+	font-size: 29upx;
+	font-weight: bold;
+	color: #2196F3;
+	border: 2upx solid #2196F3;
+	background-color: transparent;
+	transition: all 0.3s ease;
+	white-space: nowrap;
+	min-width: 120upx;
+	text-align: center;
+	flex: 1;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	&.active {
+		background-color: #ff4757;
+		color: #fff;
+		border-color: #ff4757;
+	}
 	&:active {
 		opacity: 0.8;
 	}

+ 21 - 1
mallApp/src/pages/order/buy.vue

@@ -7,6 +7,9 @@
         <view class="module-det">
           <app-list-module v-if="!$util.isEmpty(goodsInfo)" :info="goodsInfo" />
           <view class="shop-prompt">
+							<view class="operate-view" @click="modifyGoods">
+								<text class="iconfont icongouwuche"></text>返回修改
+							</view>
             <view>商品合计</view>
             <view>¥{{ goodsTotalPrice }}</view>
           </view>
@@ -133,6 +136,11 @@ export default {
     }
   },
   methods: {
+		modifyGoods() {
+			let account = this.option.account ? this.option.account : 0
+			let hdId = this.option.hdId ? this.option.hdId : 0
+			this.$util.pageTo({url:'/pages/home/category?account='+account+'&hdId='+hdId,type:2})
+		},
     init() {
       let goodsInfo = uni.getStorageSync("buyGoodsDetil") || {}
       this.isFreight = goodsInfo.freightType == 0 // True:收配送费  False:不收配送费(在配送范围内,不收配送费)。 --  freightType:运费计算方式,0按距离计算  1免运费(在配送范围内,不收配送费)
@@ -292,7 +300,7 @@ export default {
     .shop-prompt {
       display: flex;
       align-items: center;
-      justify-content: flex-end;
+      justify-content: flex-start;
       color: black;
       font-size:30upx;
       font-weight:bold;
@@ -302,6 +310,18 @@ export default {
         color: #ccc;
         margin-left: 10upx;
       }
+      .operate-view {
+        display: flex;
+        align-items: center;
+        color: #ff0000;
+        font-size:30upx;
+        font-weight:bold;
+        margin-right: auto;
+        .iconfont {
+          margin-right: 20upx;
+          font-size: 40upx;
+        }
+      }
     }
   }
   // 可选优惠