ww--ui修改

component/navigation/navigation.wxss

@@ -11,6 +11,7 @@
     flex-direction: row;
     align-items: center;
     width: 200rpx;
+    padding-left: 14rpx;
 }
 
 .navbar-operation-back,
@@ -26,5 +27,6 @@
 }
 
 .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({
 
     onLoad: function (options) {
         this.setSideHeight()
-        this.queryDetail()
-        this.queryActivity()
     },
     onShow: function () {
         this.setShopInfo(3, 1)
+        this.queryDetail()
+        this.queryActivity()
     },
 
     setSideHeight: function () {

pages/campsite/home/home.wxml

@@ -53,7 +53,7 @@
     <!-- 饮品预订 文创周边-->
     <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">
                 <image src="./image/yinpinyuding.png"></image>
             </view>
@@ -63,7 +63,7 @@
             </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">
                 <image src="./image/wenchuangzhoubian.png"></image>
             </view>

pages/commodity/menu-food/menu-food.js

@@ -34,6 +34,7 @@ Page({
     },
 
     onLoad: function (option) {
+        console.log(option)
         this.setData({
             option: option
         })

pages/commodity/shopping-cart/shopping-cart.wxml

@@ -109,23 +109,23 @@
                 <text>{{'共' + selectionTotal + '件，优惠 ￥' + amountDiscount}}</text>
             </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}}">
-            <view class="popup_wrap">
-                <view class="popup_title">抱歉，您本单商品有2件库存不足</view>
-                <view class="popup_list">
-                    <view class="popup_item row align-c" wx:for="{{notEnough}}" wx:key="id">
-                        <view class="popup_item_img">
+            <view class="popup-wrap">
+                <view class="popup-title">抱歉，您本单商品有2件库存不足</view>
+                <view class="popup-list">
+                    <view class="popup-item row align-c" wx:for="{{notEnough}}" wx:key="id">
+                        <view class="popup-item-img">
                             <image mode="widthFix" src="{{item.img}}"></image>
                         </view>
-                        <view class="popup_item_title">{{item.title}}</view>
+                        <view class="popup-item-title">{{item.title}}</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 class="popup_close_btn row con-c align-c" bindtap="handleClosePopup">
-                <view class="popup_close">
+            <view class="popup-close-btn row con-c align-c" bindtap="handleClosePopup">
+                <view class="popup-close">
                     <image mode="widthFix" src="../../../image/icon_close.png"></image>
                 </view>
             </view>

pages/commodity/shopping-cart/shopping-cart.wxss

@@ -256,15 +256,17 @@
     color: #15191F;
 }
 
-.order_pay_wrap {
+.order-pay-wrap {
     width: 188rpx;
     height: 96rpx;
     font-size: 30rpx;
     color: #fff;
+    font-weight: 600;
     background-color: #86c5e1;
+    border-radius: 4rpx;
 }
 
-.popup_wrap {
+.popup-wrap {
     width: 606rpx;
     height: 690rpx;
     padding: 0 40rpx;
@@ -272,7 +274,7 @@
     border-radius: 4rpx;
 }
 
-.popup_title {
+.popup-title {
     padding: 56rpx 0;
     font-size: 34rpx;
     font-weight: 600;
@@ -281,26 +283,26 @@
     border-bottom: 1px solid #e2e7ef;
 }
 
-.popup_list {
+.popup-list {
     padding: 26rpx 0;
 }
 
-.popup_item {
+.popup-item {
     padding: 32rpx 0;
 }
 
-.popup_item_img {
+.popup-item-img {
     width: 96rpx;
     height: 96rpx;
 }
 
-.popup_item_title {
+.popup-item-title {
     margin-left: 32rpx;
     font-size: 30rpx;
     color: #15191f;
 }
 
-.popup_back_cart {
+.popup-back-cart {
     width: 526rpx;
     height: 80rpx;
     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 id="banner" class="banner">
@@ -78,7 +78,8 @@
                 </block>
 
                 <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>
                     </view>
                 </block>
@@ -206,10 +207,10 @@
                         <view>
                             <text>{{item.content}}</text>
                         </view>
-                        <view class="evaluate-item-content-more">
+                        <!-- <view class="evaluate-item-content-more">
                             <text>...　</text>
                             <text>全文</text>
-                        </view>
+                        </view> -->
                     </view>
 
                     <view class="evaluate-item-album">

pages/play/service-detail/service-detail.wxss

@@ -160,7 +160,10 @@
 }
 
 .commodity-title text {
-    flex-grow: 1;
+    flex: 1;
+    white-space:nowrap;
+    overflow:hidden;
+    text-overflow:ellipsis;
 }
 
 .commodity-title image {

pages/play/service/service.wxss

@@ -121,11 +121,15 @@
     line-height: 52rpx;
 }
 .shop-summary {
+    display: -webkit-box;
     height: 72rpx;
     margin: 40rpx 60rpx 0;
     font-size: 26rpx;
     color: #959DA9;
     line-height: 36rpx;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+    overflow: hidden;
 }
 .shop-date {
     margin: 80rpx 60rpx 0;