diff --git a/components/menuAssembly/index.vue b/components/menuAssembly/index.vue index 29fd576..80b42ce 100644 --- a/components/menuAssembly/index.vue +++ b/components/menuAssembly/index.vue @@ -1,13 +1,13 @@ <template> <view class="page-body"> - <scroll-view class="nav-left" scroll-y :scroll-top="scrollLeftTop" scroll-with-animation> + <scroll-view class="nav-left" :class="buied?'buiedcss':''" scroll-y :scroll-top="scrollLeftTop" scroll-with-animation> <view class="nav-left-item" v-for="item in classifyData" @click="categoryClickMain(item.id)" :key="item.id" :class="item.id == categoryId ? 'active' : ''"> <span>{{ item.name }}</span> <view :class="item.id == categoryId ? 'active-line' : ''"></view> </view> </scroll-view> - <scroll-view class="nav-right" scroll-y :scroll-top="scrollTop" @scroll="scroll" @touchstart="openScroll" + <scroll-view class="nav-right" :class="buied?'buiedcss':''" scroll-y :scroll-top="scrollTop" @scroll="scroll" @touchstart="openScroll" scroll-with-animation> <view v-for="category in classifyData" :id="category.id" :key="category.id" class="box"> <view :style="loads" class="right-title">{{ category.name }}</view> @@ -28,7 +28,7 @@ <view class="price">¥<text class="num">{{ getSku(item).price }}</text></view> </view> </view> - <u-icon v-if="getSku(item).state==1" class="add" name="plus-circle-fill" color="#2979ff" @click.stop="getallNum(item, category)" size="22"></u-icon> + <u-icon v-if="getSku(item).state==1" class="add" name="plus-circle-fill" color="#003AE9" @click.stop="getallNum(item, category)" size="22"></u-icon> <div v-else style="color: orangered;font-size: 22rpx;">已售罄</div> </view> </view> @@ -39,7 +39,7 @@ <script> export default { name: 'menuAssembly', - watch: {}, + props:['buied'], data() { return { classifyData: [], @@ -354,7 +354,7 @@ export default { display: flex; align-items: center; justify-content: center; - box-shadow: 0px 3px 2px #f4f2f2; + font-family: PingFangSC-Regular, PingFang SC; } .nav-left-item:last-child { @@ -365,10 +365,12 @@ export default { height: calc(100vh - 376rpx); overflow: auto; box-sizing: border-box; - padding-top: 30rpx; + padding-top: 60rpx; width: 596rpx; } - +.buiedcss{ + height: calc(100vh - 376rpx - 183rpx); +} .box { display: block; overflow: hidden; @@ -382,12 +384,13 @@ export default { } .right-title { + font-family: PingFangSC-Medium, PingFang SC; padding-left: 28rpx; margin-bottom: 40rpx; height: 44rpx; - font-size: 32rpx; + font-size: 28rpx; font-weight: 600; - color: #000000; + color: #333333; line-height: 44rpx; } @@ -412,20 +415,22 @@ export default { flex: 1; .goods-name { + font-family: PingFangSC-Medium, PingFang SC; font-size: 28rpx; font-weight: 500; - color: #000000; + color: #333333; } .tags { .tag-item { + font-family: Arial, Helvetica SC; height: 24rpx; border-radius: 4rpx; - border: 2rpx solid #006ECF; + background-color: #f0edf1; margin-right: 10rpx; padding: 4rpx 6rpx; - font-size: 16rpx; - color: #006ECF; + font-size: 20rpx; + color: #999999; line-height: 24rpx; display: inline-block; } @@ -437,6 +442,7 @@ export default { font-weight: 400; color: #666666; line-height: 40rpx; + font-family: PingFangSC-Regular, PingFang SC; .desc { flex: 1; @@ -445,13 +451,14 @@ export default { .mon { .discount { + font-family: Futura, Arial, sans-serif; display: inline-block; height: 32rpx; - font-size: 24rpx; - color: #EB5F17; + font-size: 28rpx; + color: #333333; line-height: 32rpx; margin-right: 6rpx; - font-weight: 800; + font-weight: 600; } .price { @@ -484,8 +491,11 @@ export default { } .active { + font-family: PingFangSC-Medium, PingFang SC; font-weight: 600; - color: #000000; + color: #333333; + font-size: 24rpx; + box-shadow: 0px 2px 3px #f4f2f2; background: #fff; } diff --git a/pages/menu/menu.vue b/pages/menu/menu.vue index f1e592b..1d5f46a 100644 --- a/pages/menu/menu.vue +++ b/pages/menu/menu.vue @@ -23,18 +23,17 @@ </view> </view> <view> - <u-icon name="arrow-right" class="arrow-right-select" color="#717171"></u-icon> + <u-icon name="arrow-right" v-if="userms" class="arrow-right-select" color="#717171"></u-icon> + <button class="login-btn" v-if="!userms" open-type="getPhoneNumber" + @getphonenumber="getPhoneNumber">立刻登录 + </button> </view> </view> - <button class="login-btn" v-if="!userms" open-type="getPhoneNumber" - @getphonenumber="getPhoneNumber">立刻登录 - </button> - </view> </view> <view class="order-banner" v-if="buied" @click="openQrcode"> <view class="info"> - <view class="first">取单码:{{ orderInfo.orderNum }}</view> + <view class="first">取单码:<text class="first-code">{{ orderInfo.orderNum }}</text></view> <view class="second">请您耐心等候,剩余等候时间<text class="time">{{ orderInfo.waitTime }}</text>分钟</view> </view> <view class="line"></view> @@ -46,7 +45,7 @@ </view> </view> <ShopCar ref="shopbar" /> - <MenuAssembly ref="MenuAssembly" @getallNum="getallNum" /> + <MenuAssembly ref="MenuAssembly" @getallNum="getallNum" :buied="buied"/> <u-picker @cancel="show = false" :show="show" :immediateChange="true" ref="uPicker" :columns="columns" @confirm="confirm" keyName="name" @change="changeHandler"></u-picker> <OrderQrCode ref="OrderQrCode" /> @@ -407,16 +406,15 @@ export default { } .order-banner { - width: 686rpx; + width: 710rpx; height: 179rpx; background: #FFFFFF; - box-shadow: 0rpx 4rpx 8rpx 0rpx rgba(166, 166, 166, 0.5); - border-radius: 10rpx; + box-shadow: 4rpx 2rpx 4rpx 3rpx #f3f1f4; box-sizing: border-box; position: relative; - left: 32rpx; - top: -8rpx; - z-index: 1; + left: 20rpx; + top: 12rpx; + z-index: 10; display: flex; .info { @@ -425,12 +423,17 @@ export default { .first { height: 44rpx; - font-size: 32rpx; + font-size: 28rpx; font-family: PingFangSC-Semibold, PingFang SC; font-weight: 600; - color: #323232; + color: #6d6a6d; line-height: 44rpx; margin-top: 40rpx; + .first-code{ + font-family: Arial, Helvetica SC; + font-size: 28rpx; + color: #333333; + } } .second { @@ -439,14 +442,14 @@ export default { font-size: 24rpx; font-family: PingFangSC-Medium, PingFang SC; font-weight: 500; - color: #323232; + color: #a4a2a5; line-height: 34rpx; - + letter-spacing: 0rpx; .time { - font-size: 28rpx; - font-family: Arial-BoldMT, Arial; + font-size: 32rpx; + font-family: Futura, Arial, sans-serif; font-weight: normal; - color: #006ECF; + color: #003ae9; margin: 0 16rpx; } } @@ -455,7 +458,7 @@ export default { .line { width: 0; height: 104rpx; - border-right: 4rpx solid #006ECF; + border-right: 2rpx solid #f8f5f8; position: absolute; right: 188rpx; top: 36rpx; @@ -487,7 +490,7 @@ export default { font-size: 16rpx; font-family: PingFangSC-Medium, PingFang SC; font-weight: 500; - color: #666666; + color: #999999; line-height: 22rpx; } }