Skip to content

严立 / mini-shimao

Go to a project
Commit 646c41ce by wjw
Options

ww--ui修改

parent 73fcb671
Inline Side-by-side
Showing with 42 additions and 28 deletions
component/navigation/navigation.wxss
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
width: 200rpx; width: 200rpx;
padding-left: 14rpx;
} }
.navbar-operation-back, .navbar-operation-back,
...@@ -26,5 +27,6 @@ ...@@ -26,5 +27,6 @@
} }
.title-text text { .title-text text {
font-size: 14px; font-size: 17px;
font-weight: 500;
} }
\ No newline at end of file
pages/campsite/home/home.js
...@@ -30,11 +30,11 @@ Page({ ...@@ -30,11 +30,11 @@ Page({
onLoad: function (options) { onLoad: function (options) {
this.setSideHeight() this.setSideHeight()
this.queryDetail()
this.queryActivity()
}, },
onShow: function () { onShow: function () {
this.setShopInfo(3, 1) this.setShopInfo(3, 1)
this.queryDetail()
this.queryActivity()
}, },
setSideHeight: function () { setSideHeight: function () {
......
pages/campsite/home/home.wxml
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
<!-- 饮品预订 文创周边--> <!-- 饮品预订 文创周边-->
<view class="buy-other row con-b"> <view class="buy-other row con-b">
<!-- 饮品预订 --> <!-- 饮品预订 -->
<view class="buy-snacks row" bindtap="onBuySnacks" data-id="{{6}}"> <view class="buy-snacks row" bindtap="onBuySnacks" data-id="{{3}}">
<view class="buy-left col con-c"> <view class="buy-left col con-c">
<image src="./image/yinpinyuding.png"></image> <image src="./image/yinpinyuding.png"></image>
</view> </view>
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
</view> </view>
</view> </view>
<!-- 文创周边 --> <!-- 文创周边 -->
<view class="buy-art row" bindtap="onBuyArt" data-id="{{1}}"> <view class="buy-art row" bindtap="onBuyArt" data-id="{{3}}">
<view class="buy-left col con-c"> <view class="buy-left col con-c">
<image src="./image/wenchuangzhoubian.png"></image> <image src="./image/wenchuangzhoubian.png"></image>
</view> </view>
......
pages/commodity/menu-food/menu-food.js
...@@ -34,6 +34,7 @@ Page({ ...@@ -34,6 +34,7 @@ Page({
}, },
onLoad: function (option) { onLoad: function (option) {
console.log(option)
this.setData({ this.setData({
option: option option: option
}) })
......
pages/commodity/shopping-cart/shopping-cart.wxml
...@@ -109,23 +109,23 @@ ...@@ -109,23 +109,23 @@
<text>{{'共' + selectionTotal + '件，优惠 ￥' + amountDiscount}}</text> <text>{{'共' + selectionTotal + '件，优惠 ￥' + amountDiscount}}</text>
</view> </view>
</view> </view>
<view class="order_pay_wrap row con-c align-c" bindtap="onPaySubmit">结算</view> <view class="order-pay-wrap row con-c align-c" bindtap="onPaySubmit">结算</view>
<!-- 库存提示弹窗 --> <!-- 库存提示弹窗 -->
<l-popup show="{{isEnough}}" content-align="center" locked="{{true}}"> <l-popup show="{{isEnough}}" content-align="center" locked="{{true}}">
<view class="popup_wrap"> <view class="popup-wrap">
<view class="popup_title">抱歉，您本单商品有2件库存不足</view> <view class="popup-title">抱歉，您本单商品有2件库存不足</view>
<view class="popup_list"> <view class="popup-list">
<view class="popup_item row align-c" wx:for="{{notEnough}}" wx:key="id"> <view class="popup-item row align-c" wx:for="{{notEnough}}" wx:key="id">
<view class="popup_item_img"> <view class="popup-item-img">
<image mode="widthFix" src="{{item.img}}"></image> <image mode="widthFix" src="{{item.img}}"></image>
</view> </view>
<view class="popup_item_title">{{item.title}}</view> <view class="popup-item-title">{{item.title}}</view>
</view> </view>
</view> </view>
<view class="popup_back_cart row con-c align-c" bindtap="handleBackCart">返回购物车</view> <view class="popup-back-cart row con-c align-c" bindtap="handleBackCart">返回购物车</view>
</view> </view>
<view class="popup_close_btn row con-c align-c" bindtap="handleClosePopup"> <view class="popup-close-btn row con-c align-c" bindtap="handleClosePopup">
<view class="popup_close"> <view class="popup-close">
<image mode="widthFix" src="../../../image/icon_close.png"></image> <image mode="widthFix" src="../../../image/icon_close.png"></image>
</view> </view>
</view> </view>
......
pages/commodity/shopping-cart/shopping-cart.wxss
...@@ -256,15 +256,17 @@ ...@@ -256,15 +256,17 @@
color: #15191F; color: #15191F;
} }
.order_pay_wrap { .order-pay-wrap {
width: 188rpx; width: 188rpx;
height: 96rpx; height: 96rpx;
font-size: 30rpx; font-size: 30rpx;
color: #fff; color: #fff;
font-weight: 600;
background-color: #86c5e1; background-color: #86c5e1;
border-radius: 4rpx;
} }
.popup_wrap { .popup-wrap {
width: 606rpx; width: 606rpx;
height: 690rpx; height: 690rpx;
padding: 0 40rpx; padding: 0 40rpx;
...@@ -272,7 +274,7 @@ ...@@ -272,7 +274,7 @@
border-radius: 4rpx; border-radius: 4rpx;
} }
.popup_title { .popup-title {
padding: 56rpx 0; padding: 56rpx 0;
font-size: 34rpx; font-size: 34rpx;
font-weight: 600; font-weight: 600;
...@@ -281,26 +283,26 @@ ...@@ -281,26 +283,26 @@
border-bottom: 1px solid #e2e7ef; border-bottom: 1px solid #e2e7ef;
} }
.popup_list { .popup-list {
padding: 26rpx 0; padding: 26rpx 0;
} }
.popup_item { .popup-item {
padding: 32rpx 0; padding: 32rpx 0;
} }
.popup_item_img { .popup-item-img {
width: 96rpx; width: 96rpx;
height: 96rpx; height: 96rpx;
} }
.popup_item_title { .popup-item-title {
margin-left: 32rpx; margin-left: 32rpx;
font-size: 30rpx; font-size: 30rpx;
color: #15191f; color: #15191f;
} }
.popup_back_cart { .popup-back-cart {
width: 526rpx; width: 526rpx;
height: 80rpx; height: 80rpx;
margin-top: 32rpx; margin-top: 32rpx;
......
pages/play/service-detail/service-detail.wxml
<!-- 畅玩 - 商店详情 --> <!-- 畅玩 - 商店详情 -->
<navigation class="navigation" titleText="{{info.name}}" color="#ffffff" scrollStyle="{{navigationStyle}}" scrollHeight="{{navigationScroll}}"></navigation> <navigation class="navigation" titleText="{{info.title}}" color="#ffffff" scrollStyle="{{navigationStyle}}" scrollHeight="{{navigationScroll}}"></navigation>
<view class="container" wx:if="{{option.id !== '2'}}"> <view class="container" wx:if="{{option.id !== '2'}}">
<view id="banner" class="banner"> <view id="banner" class="banner">
...@@ -78,7 +78,8 @@ ...@@ -78,7 +78,8 @@
</block> </block>
<block wx:if="{{detailActivity.length === 0}}"> <block wx:if="{{detailActivity.length === 0}}">
<view class="commodity-card-item-nothing row con-c align-c"> <view class="commodity-card-item-nothing col con-c align-c">
<image src="{{}}"></image>
<text>近期暂无活动安排</text> <text>近期暂无活动安排</text>
</view> </view>
</block> </block>
...@@ -206,10 +207,10 @@ ...@@ -206,10 +207,10 @@
<view> <view>
<text>{{item.content}}</text> <text>{{item.content}}</text>
</view> </view>
<view class="evaluate-item-content-more"> <!-- <view class="evaluate-item-content-more">
<text>...　</text> <text>...　</text>
<text>全文</text> <text>全文</text>
</view> </view> -->
</view> </view>
<view class="evaluate-item-album"> <view class="evaluate-item-album">
......
pages/play/service-detail/service-detail.wxss
...@@ -160,7 +160,10 @@ ...@@ -160,7 +160,10 @@
} }
.commodity-title text { .commodity-title text {
flex-grow: 1; flex: 1;
white-space:nowrap;
overflow:hidden;
text-overflow:ellipsis;
} }
.commodity-title image { .commodity-title image {
......
pages/play/service/service.wxss
...@@ -121,11 +121,15 @@ ...@@ -121,11 +121,15 @@
line-height: 52rpx; line-height: 52rpx;
} }
.shop-summary { .shop-summary {
display: -webkit-box;
height: 72rpx; height: 72rpx;
margin: 40rpx 60rpx 0; margin: 40rpx 60rpx 0;
font-size: 26rpx; font-size: 26rpx;
color: #959DA9; color: #959DA9;
line-height: 36rpx; line-height: 36rpx;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
overflow: hidden;
} }
.shop-date { .shop-date {
margin: 80rpx 60rpx 0; margin: 80rpx 60rpx 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment