LL - 商品列表文件名称修改

app.json

@@ -3,7 +3,6 @@
         
         
 
 
         "pages/home/home/home",
         "pages/home/home/home",
-        "pages/home/service/service",
         "pages/home/dynamic/dynamic",
         "pages/home/dynamic/dynamic",
         "pages/home/dynamic-detail/dynamic-detail",
         "pages/home/dynamic-detail/dynamic-detail",
         "pages/home/night-appointment/night-appointment",
         "pages/home/night-appointment/night-appointment",
@@ -24,10 +23,10 @@
 
 
         "pages/commodity/home/home",
         "pages/commodity/home/home",
         "pages/commodity/shopping-cart/shopping-cart",
         "pages/commodity/shopping-cart/shopping-cart",
-        "pages/commodity/food/food",
         "pages/commodity/project/project",
         "pages/commodity/project/project",
-        "pages/commodity/snacks/snacks",
-        "pages/commodity/art/art",
+        "pages/commodity/menu-art/menu-art",
+        "pages/commodity/menu-food/menu-food",
+        "pages/commodity/menu-snacks/menu-snacks",
         "pages/commodity/room/room",
         "pages/commodity/room/room",
         "pages/commodity/room-appointment/room-appointment",
         "pages/commodity/room-appointment/room-appointment",
 
 
@@ -61,10 +60,10 @@
         "swiper-point": "../component/swiper-point/swiper-point",
         "swiper-point": "../component/swiper-point/swiper-point",
         "l-avatar": "../miniprogram_npm/lin-ui/avatar/index",
         "l-avatar": "../miniprogram_npm/lin-ui/avatar/index",
         "l-button": "../miniprogram_npm/lin-ui/button/index",
         "l-button": "../miniprogram_npm/lin-ui/button/index",
+        "l-capsule-bar": "../miniprogram_npm/lin-ui/capsule-bar/index",
         "l-card": "../miniprogram_npm/lin-ui/card/index",
         "l-card": "../miniprogram_npm/lin-ui/card/index",
         "l-checkbox": "../miniprogram_npm/lin-ui/checkbox/index",
         "l-checkbox": "../miniprogram_npm/lin-ui/checkbox/index",
         "l-checkbox-group": "../miniprogram_npm/lin-ui/checkbox-group/index",
         "l-checkbox-group": "../miniprogram_npm/lin-ui/checkbox-group/index",
-        "l-capsule-bar": "../miniprogram_npm/lin-ui/capsule-bar/index",
         "l-dialog": "../miniprogram_npm/lin-ui/dialog/index",
         "l-dialog": "../miniprogram_npm/lin-ui/dialog/index",
         "l-icon": "../miniprogram_npm/lin-ui/icon/index",
         "l-icon": "../miniprogram_npm/lin-ui/icon/index",
         "l-list": "../miniprogram_npm/lin-ui/list/index",
         "l-list": "../miniprogram_npm/lin-ui/list/index",

pages/commodity/snacks/snacks.js → pages/commodity/menu-snacks/menu-snacks.js

@@ -18,6 +18,7 @@ Page({
         scrollTop: 0,
         scrollTop: 0,
 
 
         winToast: false,
         winToast: false,
+        winLoading: false,
         winCommodityDetail: false,
         winCommodityDetail: false,
     },
     },
 
 
@@ -79,6 +80,9 @@ Page({
      *  @returns
      *  @returns
      */
      */
     queryCommodity: function () {
     queryCommodity: function () {
+        this.setData({
+            winLoading: true
+        })
         App.wxRequest({
         App.wxRequest({
             url: '/api/v1/commodity/getCommoditys',
             url: '/api/v1/commodity/getCommoditys',
             data: {
             data: {
@@ -121,9 +125,10 @@ Page({
                 }
                 }
 
 
                 this.setData({
                 this.setData({
-                    commodityList: funcCommodityList
+                    winLoading: false,
+                    commodityList: funcCommodityList,
                 })
                 })
-            }
+            },
         })
         })
     },
     },
 
 
@@ -240,7 +245,6 @@ Page({
      *  @returns
      *  @returns
      */
      */
     onShoppingCart: function() {
     onShoppingCart: function() {
-        console.log(this.data.shoppingCart)
         wx.setStorageSync('shopInfoBuffer', { 'id': this.data.shopId, 'name': this.data.shopName, 'logo': this.data.shopLogo })
         wx.setStorageSync('shopInfoBuffer', { 'id': this.data.shopId, 'name': this.data.shopName, 'logo': this.data.shopLogo })
         wx.setStorageSync('shoppingCartBuffer', this.data.shoppingCart)
         wx.setStorageSync('shoppingCartBuffer', this.data.shoppingCart)
         wx.navigateTo({
         wx.navigateTo({

pages/commodity/snacks/snacks.wxml → pages/commodity/menu-snacks/menu-snacks.wxml

-<l-toast show="{{winToast}}" l-image-class="toast-image" l-class="toast-bg" image="/image/success.png" title="添加购物车成功" />
+<l-toast
+    l-image-class="toast-image"
+    l-class="toast-bg"
+    show="{{winToast}}"
+    mask="{{true}}"
+    image="/image/success.png"
+    title="添加购物车成功"
+></l-toast>
+
+<l-toast
+    show="{{winLoading}}"
+    icon="loading"
+    title="加载中"
+    duration="20000"
+    mask="{{true}}"
+></l-toast>
 
 
 <navigation class="navigation" titleText="{{shopName}}" background="#FFFFFF;" backIcon="/image/back.png"></navigation>
 <navigation class="navigation" titleText="{{shopName}}" background="#FFFFFF;" backIcon="/image/back.png"></navigation>
 
 

pages/home/home/home.js

@@ -345,7 +345,7 @@ Page({
 
 
     onShop: function (event) {
     onShop: function (event) {
         wx.navigateTo({
         wx.navigateTo({
-            url: '/pages/commodity/snacks/snacks'
+            url: '/pages/commodity/menu-snacks/menu-snacks'
         })
         })
     },
     },
 })
 })
\ No newline at end of file

pages/home/service/service.js

-// pages/home/service/service.js
-const App = getApp()
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    imageBase: App.globalData.appResourcesBase,
-    data:[   //畅想美食
-      {url:'/image/ywssLogo@2x.png',bgc:'#586A46',},
-      {url:'/image/Logo@2x (3).png',bgc:'#13625F'},
-    ],
-    data1:[
-      {url:App.globalData.appResourcesBase+'commodity/home-shop-3.png'},
-      {url:App.globalData.appResourcesBase+'commodity/home-shop-4.png'},
-    ],
-    phone: '13316748039',
-    hotline: false, //客服热线
-  },
-  //客服热线拨打
-  call() {
-    wx.makePhoneCall({
-        phoneNumber: this.data.phone,
-    })
-},
-
-//取消拨打
-cancel() {
-    this.setData({
-        hotline: false,
-    })
-},
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
-  }
-})
\ No newline at end of file

pages/home/service/service.json

-{
-    "usingComponents": {}
-}
\ No newline at end of file

pages/mine/order/order.js

@@ -151,4 +151,10 @@ Page({
             statusActive: Number(event.currentTarget.dataset.type)
             statusActive: Number(event.currentTarget.dataset.type)
         })
         })
     },
     },
+
+    onNavigationBack: function () {
+        wx.navigateBack({
+            delta: 1
+        })
+    },
 })
 })
\ No newline at end of file

pages/mine/order/order.wxml

 <view class="navigation-order row con-b align-c">
 <view class="navigation-order row con-b align-c">
-    <image src="{{imageBase + 'icon/arrow-l-1.png'}}"></image>
+    <image src="{{imageBase + 'icon/arrow-l-1.png'}}" bindtap="onNavigationBack"></image>
     <view class="order-type row con-c align-c" bindtap="onOrderType">
     <view class="order-type row con-c align-c" bindtap="onOrderType">
         <text>{{orderTypeTitle}}</text>
         <text>{{orderTypeTitle}}</text>
         <image src="{{imageBase + 'icon/arrow-b-2.png'}}"></image>
         <image src="{{imageBase + 'icon/arrow-b-2.png'}}"></image>

pages/mine/order/order.wxss

@@ -10,8 +10,8 @@
 }
 }
 
 
 .navigation-order image {
 .navigation-order image {
-    width: 32rpx;
-    height: 32rpx;
+    width: 64rpx;
+    height: 64rpx;
 }
 }
 
 
 .order-type {
 .order-type {