LL - 资源整理

pages/commodity/room-appointment/room-appointment.wxml

@@ -4,14 +4,14 @@
 
 <view class="appointment-complete row con-c align-c" wx:if="{{appointmentComplete}}">
     <view class="appointment-complete-tip">
-        <image src="./image/tip-2.png"></image>
+        <image src="{{resourcesBase + 'commodity/room-appointment/tip.png'}}"></image>
         <l-button l-class="button" plain="{{true}}" bind:lintap="onAppointmentComplete">我知道了</l-button>
     </view>
 </view>
 
 <view class="container">
     <view class="appointment-tip">
-        <image class="background-image" src="./image/banner-2.png"></image>
+        <image class="background-image" src="{{resourcesBase + 'commodity/room-appointment/banner.png'}}"></image>
         <image class="ornament-wave" src="/image/ornament-2.png" mode="widthFix"></image>
     </view>
 

pages/home/night-appointment/night-appointment.wxml

@@ -4,7 +4,7 @@
 
 <view class="appointment-complete row con-c align-c" wx:if="{{appointmentComplete}}">
     <view class="appointment-complete-tip">
-        <image src="./image/tip-1.png"></image>
+        <image src="{{resourcesBase + 'home/night-appointment/tip.png'}}"></image>
         <l-button l-class="button" plain="{{true}}" bind:lintap="onAppointmentComplete">我知道了</l-button>
     </view>
 </view>
@@ -12,7 +12,7 @@
 <!-- 入园预约 -->
 <view class="container">
     <view class="appointment-tip">
-        <image class="background-image" src="./image/banner-1.png"></image>
+        <image class="background-image" src="{{resourcesBase + 'home/night-appointment/banner.png'}}"></image>
         <image class="ornament-wave" src="/image/ornament-2.png" mode="widthFix"></image>
     </view>
 

pages/pay/order-input/order-input.js

@@ -135,10 +135,11 @@ Page({
             case 2:
                 this.setData({
                     orderType: logicData.option.type,
-                    buyContent: this.data.shoppingCartList[0].cover,
+                    buyContentTitle: this.data.shopInfo.name,
+                    buyContentAmount: '360.00',
                     quantityTitle: '选择购买数量',
                     quantityTipText: '剩余库存',
-                    contactTitle: '填写购票人信息',
+                    contactTitle: '填写取货人信息',
 
                     winBuyContent: true,                   // 购买内容
                     winShoppingCart: false,                // 购买清单
@@ -151,18 +152,16 @@ Page({
                     winButtonPay: true,                    // 立即支付
                     winButtonAppointment: false,           // 确认预约
                 })
-
                 this.setStock()
                 break
 
             case 3:
                 this.setData({
                     orderType: logicData.option.type,
-                    buyContentTitle: this.data.shopInfo.name,
-                    buyContentAmount: '360.00',
+                    buyContent: this.data.shoppingCartList[0].cover,
                     quantityTitle: '选择购买数量',
                     quantityTipText: '剩余库存',
-                    contactTitle: '填写取货人信息',
+                    contactTitle: '填写购票人信息',
 
                     winBuyContent: true,                   // 购买内容
                     winShoppingCart: false,                // 购买清单
@@ -175,6 +174,7 @@ Page({
                     winButtonPay: true,                    // 立即支付
                     winButtonAppointment: false,           // 确认预约
                 })
+
                 this.setStock()
                 break
 

pages/pay/order-input/order-input.wxml

@@ -3,15 +3,13 @@
 <view class="container">
     <!-- winBuyContent -->
     <view class="buy-content" wx:if="{{winBuyContent}}">
+        <!-- 年卡月卡 -->
         <view class="buy-content-pass" wx:if="{{orderType === 1}}">
             <image src="{{buyContent}}"></image>
         </view>
 
-        <view class="buy-content-pass" wx:if="{{orderType === 2}}">
-            <image src="{{buyContent}}"></image>
-        </view>
-
-        <view class="buy-content-service row align-c" wx:if="{{orderType === 3}}">
+        <!-- 普通商品 -->
+        <view class="buy-content-service row align-c" wx:if="{{orderType === 2}}">
             <view class="row con-c align-c">
                 <image src="{{resourcesBase + shopInfo.cover}}"></image>
             </view>
@@ -21,6 +19,12 @@
             </view>
         </view>
 
+        <!-- 次票 -->
+        <view class="buy-content-pass" wx:if="{{orderType === 3}}">
+            <image src="{{buyContent}}"></image>
+        </view>
+
+        <!-- 文创商品 -->
         <view class="buy-content-art" wx:if="{{orderType === 4}}">
             <view class="buy-content-art-title">
                 <text>取货门店</text>
@@ -36,6 +40,7 @@
             </view>
         </view>
 
+        <!-- 餐品 -->
         <view class="buy-content-art" wx:if="{{orderType === 5}}">
             <view class="buy-content-art-title">
                 <text>取货门店</text>
@@ -55,6 +60,7 @@
             </view>
         </view>
 
+        <!-- 活动 -->
         <view class="buy-content-activity row align-c" wx:if="{{orderType === 6}}">
             <image src="{{resourcesBase + shopInfo.cover}}"></image>
             <view class="buy-content-activity-info col con-b">
@@ -70,6 +76,7 @@
             </view>
         </view>
 
+        <!-- 电影 -->
         <view class="buy-content-activity row align-c" wx:if="{{orderType === 7}}">
             <image src="{{resourcesBase + shopInfo.cover}}"></image>
             <view class="buy-content-activity-info col con-b">