LL - 修复 bug

app.js

-import mui from './component/m-init.js'
+import iMui from './component/m-init.js'
 import iBase64 from './npm/base64.js'
 import iBase64 from './npm/base64.js'
 import iMiment from './npm/miment.js'
 import iMiment from './npm/miment.js'
+import iPageExtend from './utils/page-extend.js'
 import iUtils from './utils/utils.js'
 import iUtils from './utils/utils.js'
 import iRule from './utils/rule/rule.js'
 import iRule from './utils/rule/rule.js'
 import iRequest from './utils/request/corvus.js'
 import iRequest from './utils/request/corvus.js'
@@ -35,7 +36,9 @@ App({
     },
     },
 
 
     onLaunch: function () {
     onLaunch: function () {
-        mui(this)
+        iMui(this)
+        iPageExtend()
+
         this.setUnitProportion()
         this.setUnitProportion()
         this.login()
         this.login()
 
 
@@ -48,6 +51,7 @@ App({
     },
     },
 
 
     setAppStatus: function () {
     setAppStatus: function () {
+        console.log('setAppStatus')
         this.wxRequest({
         this.wxRequest({
             url: 'v1/common/getDictByType',
             url: 'v1/common/getDictByType',
             method: 'POST',
             method: 'POST',
@@ -57,6 +61,7 @@ App({
             success: (response) => {
             success: (response) => {
                 let funcResponse = response.data
                 let funcResponse = response.data
                 this.globalData.appStatus = Boolean(Number(funcResponse[0].value))
                 this.globalData.appStatus = Boolean(Number(funcResponse[0].value))
+                this.globalData.appStatus = true
             }
             }
         })
         })
     },
     },

app.json

@@ -67,7 +67,7 @@
         "m-textarea": "./component/m-textarea/m-textarea",
         "m-textarea": "./component/m-textarea/m-textarea",
         "m-tab": "./component/m-tab/m-tab",
         "m-tab": "./component/m-tab/m-tab",
         "m-toast": "./component/m-toast/m-toast",
         "m-toast": "./component/m-toast/m-toast",
-        
+        "parser": "./component/parser.min/parser",
         "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-checkbox": "./miniprogram_npm/lin-ui/checkbox/index",
         "l-checkbox": "./miniprogram_npm/lin-ui/checkbox/index",

app.wxss

@@ -17,7 +17,11 @@
     height: 32rpx;
     height: 32rpx;
 }
 }
 
 
-/* 业主标记 */
+.bg-gradient {
+    background: linear-gradient(180deg, #FFFFFF 0%, #F3F4F6 20%, #F3F4F6 100%);
+}
+
+/* 业主相关标记 */
 .owner-mark {
 .owner-mark {
     height: 32rpx;
     height: 32rpx;
     padding: 0 12rpx;
     padding: 0 12rpx;
@@ -30,6 +34,38 @@
     color: #E8D0AF;
     color: #E8D0AF;
 }
 }
 
 
+/* 活动相关标记 */
+.discount-mark {
+    height: 32rpx;
+    padding: 0 12rpx;
+    background: #FAEDEA;
+    border-radius: 4px;
+
+    font-size: 18rpx;
+    font-weight: 500;
+    line-height: 30rpx;
+    color: #EF4E4E;
+}
+
+/* 有效价格 */
+.price-valid {
+    height: 30rpx;
+    font-size: 30rpx;
+    font-weight: 800;
+    line-height: 30rpx;
+    color: #15191F;
+}
+
+/* 无效价格，灰色删除线 */
+.price-invalid {
+    height: 22rpx;
+    font-size: 22rpx;
+    font-weight: 400;
+    line-height: 22rpx;
+    text-decoration: line-through;
+    color: #C2C7CF;
+}
+
 .tag-blue {
 .tag-blue {
     height: 32rpx;
     height: 32rpx;
     padding: 0 8rpx;
     padding: 0 8rpx;

component/m-dialog/m-dialog.js

@@ -21,9 +21,8 @@ Component({
         winDialog: false,
         winDialog: false,
     },
     },
 
 
-    // 生命周期
-    lifetimes: {
-        attached: function () {
+    pageLifetimes: {
+        show: function () {
             App.ui.dialog = this
             App.ui.dialog = this
         },
         },
     },
     },

component/m-dialog/m-dialog.wxml

@@ -5,10 +5,8 @@
             <view class="dialog-title row cc ac">
             <view class="dialog-title row cc ac">
                 <text class="regular">{{title}}</text>
                 <text class="regular">{{title}}</text>
             </view>
             </view>
-            <view class="dialog-operation row cb ac">
-                <button class="row cb ac-confirm" bindtap="onConfirm">
-                    <text class="secondary">{{confirm}}</text>
-                </button>
+            <view class="dialog-operation row cc ac border-base">
+                <button class="dialog-operation-confirm row cc ac primary" bindtap="onConfirm">{{confirm}}</button>
             </view>
             </view>
         </view>
         </view>
     </block>
     </block>
@@ -22,8 +20,8 @@
             <view class="dialog-content row cc">
             <view class="dialog-content row cc">
                 <text class="secondary">{{content}}</text>
                 <text class="secondary">{{content}}</text>
             </view>
             </view>
-            <view class="dialog-operation row cb ac">
-                <button class="row cb ac-confirm secondary" bindtap="onConfirm">{{confirm}}</button>
+            <view class="dialog-operation row cc ac border-base">
+                <button class="dialog-operation-confirm row cc ac primary" bindtap="onConfirm">{{confirm}}</button>
             </view>
             </view>
         </view>
         </view>
     </block>
     </block>

component/m-dialog/m-dialog.wxss

@@ -47,7 +47,7 @@
     width: 1px;
     width: 1px;
     height: 32rpx;
     height: 32rpx;
     border-style: none solid none solid;
     border-style: none solid none solid;
-    border-width: .5px;
+    border-width: 1px;
 }
 }
 
 
 .dialog-operation-cancel {
 .dialog-operation-cancel {

component/m-tab/m-tab.js

@@ -34,6 +34,11 @@ Component({
             type: Number,
             type: Number,
             value: 0,
             value: 0,
         },
         },
+
+        itemClass: {
+            type: String,
+            value: '',
+        }
     },
     },
 
 
     data: {
     data: {
@@ -76,7 +81,7 @@ Component({
             this.setData({
             this.setData({
                 activeIndex: funcIndex
                 activeIndex: funcIndex
             })
             })
-            this.triggerEvent('tabChange', funcItem)
+            this.triggerEvent('tabChange', Object.assign(funcItem, { index: funcIndex }))
         },
         },
 
 
         eventTabScroll: function (funcEvent) {
         eventTabScroll: function (funcEvent) {

component/m-tab/m-tab.wxml

 <view class="m-tab {{isFixed ? 'm-tab-fixed' : ''}}" style="{{'top: ' + fixedTop + 'px;'}}">
 <view class="m-tab {{isFixed ? 'm-tab-fixed' : ''}}" style="{{'top: ' + fixedTop + 'px;'}}">
-    <scroll-view class="m-item-list row ac" scroll-x="true" scroll-left="{{scrollLeft}}" bindscroll="eventTabScroll">
+    <scroll-view class="m-item-list row ae" scroll-x="true" scroll-left="{{scrollLeft}}" bindscroll="eventTabScroll">
         <block wx:for="{{item}}" wx:for-item="item" wx:for-index="index" wx:key="index">
         <block wx:for="{{item}}" wx:for-item="item" wx:for-index="index" wx:key="index">
             <view
             <view
-                class="m-item {{activeIndex === index ? 'm-item-active' : 'm-item-inactive'}}"
+                class="m-item row cc ac {{itemClass}}"
                 data-item="{{item}}"
                 data-item="{{item}}"
                 data-index="{{index}}"
                 data-index="{{index}}"
                 bindtap="onItem"
                 bindtap="onItem"
             >
             >
-                <text>{{item.text}}</text>
+                <text class="{{activeIndex === index ? 'm-item-active' : 'm-item-inactive'}}">{{item.text}}</text>
             </view>
             </view>
         </block>
         </block>
     </scroll-view>
     </scroll-view>

component/m-tab/m-tab.wxss

 .m-tab {
 .m-tab {
     z-index: 4;
     z-index: 4;
     width: 750rpx;
     width: 750rpx;
-    height: 74rpx;
     padding: 0 0 0 40rpx;
     padding: 0 0 0 40rpx;
     border-bottom: 1px #E2E7EF solid;
     border-bottom: 1px #E2E7EF solid;
     background: #FFFFFF;
     background: #FFFFFF;
@@ -15,7 +14,10 @@
 
 
 .m-item-list {
 .m-item-list {
     width: 710rpx;
     width: 710rpx;
+    margin: 0;
+    padding: 0;
     white-space: nowrap;
     white-space: nowrap;
+    border: none;
 }
 }
 
 
 .m-item-list::-webkit-scrollbar {
 .m-item-list::-webkit-scrollbar {
@@ -25,7 +27,12 @@
 .m-item {
 .m-item {
     display: inline-block;
     display: inline-block;
     margin-right: 80rpx;
     margin-right: 80rpx;
-    padding-bottom: 26rpx;
+    text-align: center;
+}
+
+.m-item > text {
+    display: inline-block;
+    height: 60rpx;
 
 
     font-size: 26rpx;
     font-size: 26rpx;
     font-weight: 500;
     font-weight: 500;

component/m-toast/m-toast.js

@@ -21,9 +21,8 @@ Component({
         winToast: false,
         winToast: false,
     },
     },
 
 
-    // 生命周期
-    lifetimes: {
-        attached: function () {
+    pageLifetimes: {
+        show: function () {
             App.ui.toast = this
             App.ui.toast = this
         },
         },
     },
     },

component/picker/picker.wxss

@@ -56,7 +56,7 @@
 	display: flex;
 	display: flex;
 	justify-content: space-between;
 	justify-content: space-between;
 	align-items: center;
 	align-items: center;
-	border-bottom: 0.5px solid #eeeeee;
+	border-bottom: 1px solid #eeeeee;
 }
 }
 .picker-header view {
 .picker-header view {
 	height: 100%;
 	height: 100%;

pages/campsite/home-mirror/home-mirror.wxml

@@ -38,7 +38,7 @@
     <view class="buy-coupon" bindtap="onBuyMembership" data-id="{{3}}">
     <view class="buy-coupon" bindtap="onBuyMembership" data-id="{{3}}">
         <view class="buy-coupon-title row align-c">
         <view class="buy-coupon-title row align-c">
             <image src="../home/image/ruyuangoupiao.png"></image>
             <image src="../home/image/ruyuangoupiao.png"></image>
-            <image src="/image/more.png"></image>
+            <image src="{{imageBase + 'icon/arrow-r-1.png'}}"></image>
         </view>
         </view>
         <view class="buy-coupon-type row con-b">
         <view class="buy-coupon-type row con-b">
             <image src="../home/image/single.png"></image>
             <image src="../home/image/single.png"></image>

pages/campsite/home-mirror/home-mirror.wxss

@@ -91,7 +91,7 @@
     padding: 40rpx 32rpx;
     padding: 40rpx 32rpx;
     background: rgba(255, 255, 255, 0.85);
     background: rgba(255, 255, 255, 0.85);
     box-shadow: 8rpx 10rpx 52rpx 0rpx rgba(238,211,153,0.3);
     box-shadow: 8rpx 10rpx 52rpx 0rpx rgba(238,211,153,0.3);
-    border-radius: 4rpx;
+    border-radius: 4px;
 }
 }
 
 
 .buy-coupon-title image:nth-child(1) {
 .buy-coupon-title image:nth-child(1) {
@@ -124,7 +124,7 @@
     height: 154rpx;
     height: 154rpx;
     background: rgba(255, 255, 255, 0.65);
     background: rgba(255, 255, 255, 0.65);
     box-shadow: 8rpx 8rpx 52rpx 0rpx rgba(238,211,153,0.3);
     box-shadow: 8rpx 8rpx 52rpx 0rpx rgba(238,211,153,0.3);
-    border-radius: 4rpx;
+    border-radius: 4px;
 }
 }
 
 
 .buy-left, .buy-right {
 .buy-left, .buy-right {
@@ -220,7 +220,7 @@
 .share-operation button:nth-child(1) {
 .share-operation button:nth-child(1) {
     width: 288rpx;
     width: 288rpx;
     height: 96rpx;
     height: 96rpx;
-    border-radius: 4rpx;
+    border-radius: 4px;
     background: #FFFFFF;
     background: #FFFFFF;
 
 
     text-align: center;
     text-align: center;
@@ -233,7 +233,7 @@
 .share-operation button:nth-child(2) {
 .share-operation button:nth-child(2) {
     width: 288rpx;
     width: 288rpx;
     height: 96rpx;
     height: 96rpx;
-    border-radius: 4rpx;
+    border-radius: 4px;
     background: #15191F;
     background: #15191F;
 
 
     text-align: center;
     text-align: center;

pages/campsite/home/home.wxml

@@ -35,7 +35,7 @@
     <view class="buy-coupon" bindtap="onBuyMembership" data-id="{{3}}">
     <view class="buy-coupon" bindtap="onBuyMembership" data-id="{{3}}">
         <view class="buy-coupon-title row align-c">
         <view class="buy-coupon-title row align-c">
             <image src="./image/ruyuangoupiao.png"></image>
             <image src="./image/ruyuangoupiao.png"></image>
-            <image src="/image/more.png"></image>
+            <image src="{{imageBase + 'icon/arrow-r-1.png'}}"></image>
         </view>
         </view>
         <view class="buy-coupon-type row con-b">
         <view class="buy-coupon-type row con-b">
             <image src="./image/single.png"></image>
             <image src="./image/single.png"></image>

pages/campsite/home/home.wxss

@@ -92,7 +92,7 @@
     padding: 40rpx 32rpx;
     padding: 40rpx 32rpx;
     background: rgba(255, 255, 255, 0.85);
     background: rgba(255, 255, 255, 0.85);
     box-shadow: 8rpx 10rpx 52rpx 0rpx rgba(238,211,153,0.3);
     box-shadow: 8rpx 10rpx 52rpx 0rpx rgba(238,211,153,0.3);
-    border-radius: 4rpx;
+    border-radius: 4px;
 }
 }
 
 
 .buy-coupon-title image:nth-child(1) {
 .buy-coupon-title image:nth-child(1) {
@@ -125,7 +125,7 @@
     height: 154rpx;
     height: 154rpx;
     background: rgba(255, 255, 255, 0.65);
     background: rgba(255, 255, 255, 0.65);
     box-shadow: 8rpx 8rpx 52rpx 0rpx rgba(238,211,153,0.3);
     box-shadow: 8rpx 8rpx 52rpx 0rpx rgba(238,211,153,0.3);
-    border-radius: 4rpx;
+    border-radius: 4px;
 }
 }
 
 
 .buy-left, .buy-right {
 .buy-left, .buy-right {
@@ -219,7 +219,7 @@
 .share-operation button:nth-child(1) {
 .share-operation button:nth-child(1) {
     width: 288rpx;
     width: 288rpx;
     height: 96rpx;
     height: 96rpx;
-    border-radius: 4rpx;
+    border-radius: 4px;
     background: #FFFFFF;
     background: #FFFFFF;
 
 
     text-align: center;
     text-align: center;
@@ -232,7 +232,7 @@
 .share-operation button:nth-child(2) {
 .share-operation button:nth-child(2) {
     width: 288rpx;
     width: 288rpx;
     height: 96rpx;
     height: 96rpx;
-    border-radius: 4rpx;
+    border-radius: 4px;
     background: #15191F;
     background: #15191F;
 
 
     text-align: center;
     text-align: center;

pages/club/create/create.wxss

@@ -64,8 +64,8 @@
     height: 80rpx;
     height: 80rpx;
     margin: 16rpx 0 8rpx 0;
     margin: 16rpx 0 8rpx 0;
     padding: 0 24rpx;
     padding: 0 24rpx;
-    border-radius: 4rpx;
-    border: 0.5px solid #DBDFE5;
+    border-radius: 4px;
+    border: 1px solid #DBDFE5;
 
 
     font-size: 30rpx;
     font-size: 30rpx;
     font-weight: 400;
     font-weight: 400;

pages/club/enter/enter.wxss

@@ -61,7 +61,7 @@
     margin: 16rpx 0 8rpx 0;
     margin: 16rpx 0 8rpx 0;
     padding: 0 24rpx;
     padding: 0 24rpx;
     border-radius: 4rpx;
     border-radius: 4rpx;
-    border: 0.5px solid #DBDFE5;
+    border: 1px solid #DBDFE5;
 
 
     font-size: 30rpx;
     font-size: 30rpx;
     font-weight: 400;
     font-weight: 400;

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

@@ -200,14 +200,14 @@ Page({
             duration: 30000
             duration: 30000
         })
         })
 
 
-        App.wxRequest({
+        console.log(this.data.shopInfo)
+        App.request({
             url: 'v1/commodity/getCommoditys',
             url: 'v1/commodity/getCommoditys',
-            data: {
+            params: {
                 'officeId': this.data.shopInfo.id,
                 'officeId': this.data.shopInfo.id,
-                // 'classifyId': this.data.sideBar[this.data.sideBarIndex].id,
                 'genre': this.data.shopInfo.shopType,
                 'genre': this.data.shopInfo.shopType,
-            },
-            success: (response) => {
+            }
+        }).then((response) => {
             let funcCommodityList = []
             let funcCommodityList = []
                 let funcResponse = response.data
                 let funcResponse = response.data
                 for (let i = 0, l = funcResponse.length; i < l; i++) {
                 for (let i = 0, l = funcResponse.length; i < l; i++) {
@@ -262,7 +262,8 @@ Page({
 
 
                 // 分类商品列表
                 // 分类商品列表
                 this.setCommodityClassification(funcCommodityList)
                 this.setCommodityClassification(funcCommodityList)
-            },
+        }).catch((response) => {
+            console.log('resolve', response)
         })
         })
     },
     },
 
 

pages/commodity/menu-food/menu-food.wxss

@@ -254,7 +254,7 @@ page {
 .popup-footer-wrapper {
 .popup-footer-wrapper {
     margin: 0 40rpx;
     margin: 0 40rpx;
     padding: 40rpx 0;
     padding: 40rpx 0;
-    border-top: 0.5px solid #e2e7ef;
+    border-top: 1px solid #e2e7ef;
 }
 }
 
 
 .popup-price-row {
 .popup-price-row {

pages/commodity/project-detail/project-detail.js

@@ -39,7 +39,9 @@ Page({
                     navTitle: '儿童营地入园购票',
                     navTitle: '儿童营地入园购票',
                     banner: 'service/detail-banner-3.png',
                     banner: 'service/detail-banner-3.png',
                     bgColor: '#F6DADA',
                     bgColor: '#F6DADA',
-                    buyText: '购买门票',
+                    // 测试
+                    // buyText: '购买门票',
+                    buyText: '暂未开售',
                     unitText: '/人',
                     unitText: '/人',
                     commodityList: []
                     commodityList: []
                 })
                 })
@@ -313,7 +315,9 @@ Page({
      *  @returns
      *  @returns
      */
      */
     onBuy: function (event) {
     onBuy: function (event) {
-        // if (this.data.shopInfo.appId === 3) return
+        // 测试
+        // 正式环境临时隐藏儿童营地
+        if (this.data.shopInfo.appId === 3) return
 
 
         if (this.data.shopInfo.appId === 7) {
         if (this.data.shopInfo.appId === 7) {
             this.onCommodityDetail(event)
             this.onCommodityDetail(event)

pages/commodity/project/project.wxml

@@ -19,7 +19,7 @@
         <!-- 海错图门票 -->
         <!-- 海错图门票 -->
         <view class="shop-item">
         <view class="shop-item">
             <view class="shop-name row align-c">
             <view class="shop-name row align-c">
-                <image src="{{resourcesBase + 'shop/logo-1.png'}}" style="width: 32rpx; height: 66rpx;"></image>
+                <image mode="heightFix" src="{{resourcesBase + 'shop/logo-1.png'}}"></image>
                 <text>故宫里的海洋世界—海错图</text>
                 <text>故宫里的海洋世界—海错图</text>
             </view>
             </view>
             <view class="commodity-list">
             <view class="commodity-list">
@@ -85,7 +85,7 @@
         <!-- 水养韵苑 -->
         <!-- 水养韵苑 -->
         <view class="shop-item">
         <view class="shop-item">
             <view class="shop-name row align-c">
             <view class="shop-name row align-c">
-                <image src="{{resourcesBase + 'shop/logo-7.png'}}" style="width: 50rpx; height: 62rpx;"></image>
+                <image mode="heightFix" src="{{resourcesBase + 'shop/logo-7.png'}}"></image>
                 <text>元养水韵SPA</text>
                 <text>元养水韵SPA</text>
             </view>
             </view>
             <view class="commodity-list">
             <view class="commodity-list">
@@ -171,7 +171,7 @@
         <!-- 儿童营地 -->
         <!-- 儿童营地 -->
         <view class="shop-item">
         <view class="shop-item">
             <view class="shop-name row align-c">
             <view class="shop-name row align-c">
-                <image src="{{resourcesBase + 'shop/logo-3.png'}}" style="width: 64rpx; height: 50rpx;"></image>
+                <image mode="heightFix" src="{{resourcesBase + 'shop/logo-3.png'}}"></image>
                 <text>儿童营地</text>
                 <text>儿童营地</text>
             </view>
             </view>
             <view class="commodity-list">
             <view class="commodity-list">

pages/commodity/project/project.wxss

@@ -44,7 +44,10 @@
 }
 }
 
 
 .shop-name image {
 .shop-name image {
-    margin-right: 20rpx;
+    max-width: 86rpx;
+    width: 100%;
+    max-height: 64rpx;
+    margin: 0 20rpx 0 0;
 }
 }
 
 
 .shop-name text {
 .shop-name text {
@@ -56,7 +59,7 @@
 .commodity-item {
 .commodity-item {
     padding-bottom: 50rpx;
     padding-bottom: 50rpx;
     margin-top: 50rpx;
     margin-top: 50rpx;
-    border-bottom: 0.5px #E2E7EF solid;
+    border-bottom: 1px #E2E7EF solid;
 }
 }
 
 
 .commodity-item:last-child {
 .commodity-item:last-child {

pages/commodity/room-appointment/room-appointment.wxss

@@ -26,7 +26,7 @@
     left: 88rpx;
     left: 88rpx;
     width: 432rpx;
     width: 432rpx;
     height: 80rpx;
     height: 80rpx;
-    border: 0.5px #15191f solid;
+    border: 1px #15191f solid;
     border-radius: 2px;
     border-radius: 2px;
     color: #15191f;
     color: #15191f;
     background: #fefcf9;
     background: #fefcf9;
@@ -77,7 +77,7 @@
     height: 80rpx;
     height: 80rpx;
     margin-top: 32rpx;
     margin-top: 32rpx;
     padding: 0 24rpx;
     padding: 0 24rpx;
-    border: 0.5px #DBDFE5 solid;
+    border: 1px #DBDFE5 solid;
     border-radius: 2px;
     border-radius: 2px;
 }
 }
 
 
@@ -159,7 +159,7 @@
     height: 96rpx;
     height: 96rpx;
     margin-bottom: 40rpx;
     margin-bottom: 40rpx;
     background: #FFFFFF;
     background: #FFFFFF;
-    border:1rpx solid #86C5E1;
+    border: 1px solid #86C5E1;
     border-radius: 2px;
     border-radius: 2px;
 
 
     font-size: 30rpx;
     font-size: 30rpx;
@@ -173,7 +173,7 @@
     height: 96rpx;
     height: 96rpx;
     margin-bottom: 40rpx;
     margin-bottom: 40rpx;
     background: #C8E1EC;
     background: #C8E1EC;
-    border: 0.5px solid #C8E1EC;
+    border: 1px solid #C8E1EC;
     border-radius: 2px;
     border-radius: 2px;
 
 
     font-size: 30rpx;
     font-size: 30rpx;

pages/commodity/shopping-cart/shopping-cart.js

@@ -16,8 +16,6 @@ Page({
         amountPay: 0,                       // 支付金额
         amountPay: 0,                       // 支付金额
         amountDiscount: 0,                  // 优惠金额
         amountDiscount: 0,                  // 优惠金额
 
 
-        isIphoneX: '', //判断是否为iphonex
-
         allChecked: false,
         allChecked: false,
         isFoodCart: true,
         isFoodCart: true,
         isEnough: false,
         isEnough: false,
@@ -77,7 +75,6 @@ Page({
         this.setShopInfo()
         this.setShopInfo()
         this.setData({
         this.setData({
             shoppingCart: wx.getStorageSync('shoppingCartBuffer'),
             shoppingCart: wx.getStorageSync('shoppingCartBuffer'),
-            isIphoneX: wx.getSystemInfoSync().model.indexOf("iPhone X")
         })
         })
 
 
         this.selectionTotal()
         this.selectionTotal()

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

@@ -84,11 +84,11 @@
 
 
     <!-- 只有在食品购物车才出现 -->
     <!-- 只有在食品购物车才出现 -->
     <view class="pay-tip row align-c" wx:if="{{shopInfo.shopType === 5}}">
     <view class="pay-tip row align-c" wx:if="{{shopInfo.shopType === 5}}">
-        <image src="{{imageBase + 'fail-glod.png'}}"></image>
+        <image src="{{imageBase + 'icon/warning-4.png'}}"></image>
         <text>请在下单3天内取餐，逾期无效</text>
         <text>请在下单3天内取餐，逾期无效</text>
     </view>
     </view>
 
 
-    <view class="pay row con-c align-c" style="padding-bottom:{{isIphoneX >=0?36:0}}rpx;">
+    <view class="pay row con-c align-c">
         <!-- 选择计数 -->
         <!-- 选择计数 -->
         <view class="pay-selection row con-c align-c">
         <view class="pay-selection row con-c align-c">
             <l-checkbox-group l-class="list-item-selection" bind:linchange="onSelectionAll">
             <l-checkbox-group l-class="list-item-selection" bind:linchange="onSelectionAll">

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

@@ -130,7 +130,7 @@
     width: 168rpx;
     width: 168rpx;
     height: 48rpx;
     height: 48rpx;
     padding: 0 14rpx;
     padding: 0 14rpx;
-    border: 0.5px solid #DBDFE5;
+    border: 1px solid #DBDFE5;
     border-radius: 4rpx;
     border-radius: 4rpx;
 }
 }
 
 
@@ -142,7 +142,7 @@
 .list-item-quantity-operation text {
 .list-item-quantity-operation text {
     width: 54rpx;
     width: 54rpx;
     height: 24rpx;
     height: 24rpx;
-    border: 0.5px #DBDFE5 solid;
+    border: 1px #DBDFE5 solid;
     border-style: none solid none solid;
     border-style: none solid none solid;
 
 
     text-align: center;
     text-align: center;
@@ -164,15 +164,10 @@
     color: #D92B3A;
     color: #D92B3A;
 }
 }
 
 
-
-
-
-
-
 .pay-tip {
 .pay-tip {
     position: fixed;
     position: fixed;
     left: 0;
     left: 0;
-    bottom: 200rpx;
+    bottom: 160rpx;
     width: 750rpx;
     width: 750rpx;
     height: 72rpx;
     height: 72rpx;
     padding: 0 40rpx;
     padding: 0 40rpx;
@@ -199,9 +194,9 @@
     left: 0;
     left: 0;
     bottom: 0;
     bottom: 0;
     width: 750rpx;
     width: 750rpx;
-    height: 200rpx;
+    height: 160rpx;
     padding: 0 40rpx 0rpx 36rpx;
     padding: 0 40rpx 0rpx 36rpx;
-    border-top: 0.5px solid #E2E7EF;
+    border-top: 1px solid #E2E7EF;
     background: #FFFFFF;
     background: #FFFFFF;
 }
 }
 
 
@@ -269,7 +264,7 @@
     font-weight: 600;
     font-weight: 600;
     color: #15191f;
     color: #15191f;
     text-align: center;
     text-align: center;
-    border-bottom: 0.5px solid #e2e7ef;
+    border-bottom: 1px solid #e2e7ef;
 }
 }
 
 
 .popup-list {
 .popup-list {

pages/home/dynamic/dynamic.wxss

@@ -3,7 +3,7 @@
     height: 150rpx;
     height: 150rpx;
     margin-top: 60rpx;
     margin-top: 60rpx;
     padding: 0 40rpx 50rpx 40rpx;
     padding: 0 40rpx 50rpx 40rpx;
-    border-bottom: 0.5px #2C3035 solid;
+    border-bottom: 1px #2C3035 solid;
 }
 }
 
 
 .title image:nth-child(1) {
 .title image:nth-child(1) {
@@ -20,7 +20,7 @@
 .notice-item {
 .notice-item {
     margin-top: 50rpx;
     margin-top: 50rpx;
     padding: 0 40rpx 50rpx 40rpx;
     padding: 0 40rpx 50rpx 40rpx;
-    border-bottom: 0.5px #575759 solid;
+    border-bottom: 1px #575759 solid;
 }
 }
 
 
 .notice-title text {
 .notice-title text {

pages/home/home/home.js

@@ -50,14 +50,16 @@ Page({
         }).then((response) => {
         }).then((response) => {
             let funcData = response.data
             let funcData = response.data
             let funcList = []
             let funcList = []
-            for (let i = 0; i < 3; i++) {
+            for (let i = 0, l = funcData.length; i < l; i++) {
                 let funcItem = {
                 let funcItem = {
                     'id': funcData[i].id,
                     'id': funcData[i].id,
                     'cover': funcData[i].img,
                     'cover': funcData[i].img,
                     'targetId': funcData[i].jumpId,
                     'targetId': funcData[i].jumpId,
                     'targetType': funcData[i].jumpColumnId ? Number(funcData[i].jumpColumnId) : funcData[i].jumpColumnId,
                     'targetType': funcData[i].jumpColumnId ? Number(funcData[i].jumpColumnId) : funcData[i].jumpColumnId,
+                    'type': Number(funcData[i].smColumnId)
                 }
                 }
-                funcList.push(funcItem)
+
+                if (funcItem.type === 0) funcList.push(funcItem)
             }
             }
             this.setData({
             this.setData({
                 banner: funcList
                 banner: funcList
@@ -236,22 +238,6 @@ Page({
     },
     },
 
 
     /**
     /**
-     *  页面分享事件
-     *  @function
-     *  @param {object} - funcEvent
-     *  @returns
-     */
-    onShareAppMessage: function (res) {
-        if (res.from === 'button') {
-            // 来自页面内转发按钮
-        }
-        return {
-            title: '碧海银湖 | 理想生活',
-            path: '/pages/home/home/home'
-        }
-    },
-
-    /**
      *  banner 切换图片同步自定义标识组件
      *  banner 切换图片同步自定义标识组件
      *  @function
      *  @function
      *  @param {object} - funcEvent
      *  @param {object} - funcEvent

pages/home/home/home.wxml

@@ -28,7 +28,7 @@
             </view>
             </view>
             <view class="row cb ac">
             <view class="row cb ac">
                 <text class="sign-in-content">消费积分 业主特权</text>
                 <text class="sign-in-content">消费积分 业主特权</text>
-                <image class="arrow-more" src="{{imageBase + 'more-g.png'}}"></image>
+                <image class="arrow-more" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
             </view>
             </view>
         </view>
         </view>
 
 
@@ -46,7 +46,7 @@
                     </swiper-item>
                     </swiper-item>
                 </block>
                 </block>
                 </swiper>
                 </swiper>
-                <image class="arrow-more" src="{{imageBase + 'more-g.png'}}" bindtap="onNoticeList"></image>
+                <image class="arrow-more" src="{{imageBase + 'icon/arrow-r-2.png'}}" bindtap="onNoticeList"></image>
             </view>
             </view>
         </view>
         </view>
 
 
@@ -64,7 +64,7 @@
                     </view>
                     </view>
                 </view>
                 </view>
                 <view class="night-info-more row align-c">
                 <view class="night-info-more row align-c">
-                    <image src="{{imageBase + 'more-w.png'}}"></image>
+                    <image src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
                 </view>
                 </view>
             </view>
             </view>
 
 

pages/home/night-appointment/night-appointment.wxss

@@ -26,7 +26,7 @@
     left: 88rpx;
     left: 88rpx;
     width: 432rpx;
     width: 432rpx;
     height: 80rpx;
     height: 80rpx;
-    border: 0.5px #15191f solid;
+    border: 1px #15191f solid;
     border-radius: 2px;
     border-radius: 2px;
     color: #15191f;
     color: #15191f;
     background: #fefcf9;
     background: #fefcf9;
@@ -77,7 +77,7 @@
     height: 80rpx;
     height: 80rpx;
     margin-top: 32rpx;
     margin-top: 32rpx;
     padding: 20rpx 24rpx;
     padding: 20rpx 24rpx;
-    border: 0.5px #DBDFE5 solid;
+    border: 1px #DBDFE5 solid;
     border-radius: 2px;
     border-radius: 2px;
 }
 }
 
 
@@ -182,7 +182,7 @@
     height: 96rpx;
     height: 96rpx;
     margin-bottom: 40rpx;
     margin-bottom: 40rpx;
     background: #FFFFFF;
     background: #FFFFFF;
-    border: 0.5px solid #86C5E1;
+    border: 1px solid #86C5E1;
     border-radius: 2px;
     border-radius: 2px;
 
 
     font-size: 30rpx;
     font-size: 30rpx;
@@ -196,7 +196,7 @@
     height: 96rpx;
     height: 96rpx;
     margin-bottom: 40rpx;
     margin-bottom: 40rpx;
     background: #C8E1EC;
     background: #C8E1EC;
-    border: 0.5px solid #C8E1EC;
+    border: 1px solid #C8E1EC;
     border-radius: 2px;
     border-radius: 2px;
 
 
     font-size: 30rpx;
     font-size: 30rpx;

pages/mine/accumulate/accumulate.wxml

@@ -19,8 +19,7 @@
         <image wx:if="{{!showMenu}}" src="/image/icon/arrow-b-2.png"></image>
         <image wx:if="{{!showMenu}}" src="/image/icon/arrow-b-2.png"></image>
         <view class="banner-menu-down col" wx:if="{{showMenu}}">
         <view class="banner-menu-down col" wx:if="{{showMenu}}">
             <block wx:for="{{menuList}}" wx:key="id">
             <block wx:for="{{menuList}}" wx:key="id">
-                <text class="{{menu === item.name ? 'selected' : ''}}" data-type="{{item.id}}"  catchtap="onTabMenu"
-                    data-index="{{index}}">{{item.name}}</text>
+                <text class="{{menu === item.name ? 'selected' : ''}}" data-type="{{item.id}}" data-index="{{index}}" catchtap="onTabMenu">{{item.name}}</text>
             </block>
             </block>
         </view>
         </view>
     </view>
     </view>

pages/mine/accumulate/accumulate.wxss

@@ -112,7 +112,7 @@ page {
     height: 120rpx;
     height: 120rpx;
     min-height: 120rpx;
     min-height: 120rpx;
     padding: 20rpx 0 18rpx;
     padding: 20rpx 0 18rpx;
-    border-bottom: 0.5px solid #E2E7EF;
+    border-bottom: 1px solid #E2E7EF;
 }
 }
 
 
 .accumulate:last-child {
 .accumulate:last-child {

pages/mine/appointment-detail/appointment-detail.wxss

@@ -192,7 +192,7 @@
 .commodity-item {
 .commodity-item {
     width: 606rpx;
     width: 606rpx;
     height: 184rpx;
     height: 184rpx;
-    border-bottom: 0.5px #e2e7ef solid;
+    border-bottom: 1px #e2e7ef solid;
 }
 }
 
 
 .commodity-item>image {
 .commodity-item>image {
@@ -422,7 +422,7 @@
     width: 100%;
     width: 100%;
     padding: 48rpx 32rpx 46rpx;
     padding: 48rpx 32rpx 46rpx;
     background: #F5F6F8;
     background: #F5F6F8;
-    border-bottom: 0.5px dashed #e2e7ef;
+    border-bottom: 1px dashed #e2e7ef;
 }
 }
 
 
 .ticket-left {
 .ticket-left {
@@ -695,7 +695,7 @@
 .goods-item {
 .goods-item {
     margin-bottom: 22rpx;
     margin-bottom: 22rpx;
     padding-bottom: 22rpx;
     padding-bottom: 22rpx;
-    border-bottom: 0.5px solid #e2e7ef;
+    border-bottom: 1px solid #e2e7ef;
 }
 }
 
 
 .goods-item:last-child {
 .goods-item:last-child {
@@ -798,7 +798,7 @@
     width: 100%;
     width: 100%;
     background: #FFFFFF;
     background: #FFFFFF;
     padding: 32rpx 20rpx;
     padding: 32rpx 20rpx;
-    border-top: 0.5px solid #e2e7ef;
+    border-top: 1px solid #e2e7ef;
 }
 }
 
 
 .delete-btn, .order-btn {
 .delete-btn, .order-btn {

pages/mine/appointment/appointment.wxss

@@ -241,7 +241,7 @@
     text-align: center;
     text-align: center;
     line-height: 56rpx;
     line-height: 56rpx;
     border-radius: 4rpx;
     border-radius: 4rpx;
-    border: 0.5px solid #C2C7CF;
+    border: 1px solid #C2C7CF;
 }
 }
 .cancel {
 .cancel {
     position: absolute;
     position: absolute;

pages/mine/home/home.js

@@ -293,8 +293,8 @@ Page({
         App.request({
         App.request({
             url: 'v1/order/getOrderList',
             url: 'v1/order/getOrderList',
             params: {
             params: {
-                goodType: '', //数据字典(good_type) 商品分类(全部为"")
-                status: 2, //状态(-1已取消0未付款1未发货2待使用3已使用4已过期)
+                goodType: '',
+                status: 2,
                 pageNo: 1,
                 pageNo: 1,
                 pageSize: -1
                 pageSize: -1
             }
             }
@@ -302,6 +302,9 @@ Page({
             let funcData = response.data
             let funcData = response.data
             let funcList = []
             let funcList = []
             for (let i = 0, l = funcData.length; i < l; i++) {
             for (let i = 0, l = funcData.length; i < l; i++) {
+                // 排除年卡月卡类型
+                if (funcData[i].goodType === '1') continue
+
                 let funcItem = {
                 let funcItem = {
                     'orderId': funcData[i].orderId,
                     'orderId': funcData[i].orderId,
                     'orderStatus': funcData[i].status,
                     'orderStatus': funcData[i].status,
@@ -320,7 +323,7 @@ Page({
                 let funcOrderDetail = funcData[i].smOrderDetails
                 let funcOrderDetail = funcData[i].smOrderDetails
                 for (let ii = 0, ll = funcOrderDetail.length; ii < ll; ii++) {
                 for (let ii = 0, ll = funcOrderDetail.length; ii < ll; ii++) {
                     let funcDetailItem = {
                     let funcDetailItem = {
-                        'cover': funcOrderDetail[ii].imgUrl,
+                        'cover': funcOrderDetail[ii].imgUrl ? funcOrderDetail[ii].imgUrl : this.data.resourcesBase + 'commodity/menu/commodity-item.png',
                         'priceUnit': funcOrderDetail[ii].unitPrice,
                         'priceUnit': funcOrderDetail[ii].unitPrice,
                         'quantity': funcOrderDetail[ii].number,
                         'quantity': funcOrderDetail[ii].number,
                         'name': funcOrderDetail[ii].name,
                         'name': funcOrderDetail[ii].name,
@@ -371,12 +374,13 @@ Page({
                         break
                         break
                 }
                 }
 
 
-                // 排除年卡月卡类型
-                if (funcItem.commodityType !== '1') funcList.push(funcItem)
+                funcList.push(funcItem)
             }
             }
             this.setData({
             this.setData({
                 orderList: funcList
                 orderList: funcList
             })
             })
+
+            console.log(this.data.orderList)
         }).catch((response) => {})
         }).catch((response) => {})
     },
     },
 
 

pages/mine/home/home.wxml

@@ -45,13 +45,14 @@
                 <text>享受业主尊贵特权，预定消费专属优惠</text>
                 <text>享受业主尊贵特权，预定消费专属优惠</text>
             </view>
             </view>
             <view class="status-operation row cc ac" bindtap="onAuthentication">
             <view class="status-operation row cc ac" bindtap="onAuthentication">
-                <image wx:if="{{statusText == '审核失败'}}" src="/image/fail-icon.png"></image>
-                <image wx:if="{{statusText == '审核中'}}" src="/image/sh-icon.png"></image>
+                <image wx:if="{{statusText == '审核失败'}}" src="{{imageBase + 'icon/warning-1.png'}}"></image>
+                <image wx:if="{{statusText == '审核中'}}" src="{{imageBase + 'icon/clock-1.png'}}"></image>
                 <text>{{statusText}}</text>
                 <text>{{statusText}}</text>
             </view>
             </view>
         </view>
         </view>
     </block>
     </block>
 
 
+
     <!-- 业主信息面板 -->
     <!-- 业主信息面板 -->
     <block wx:if="{{userInfo.userType === 1}}">
     <block wx:if="{{userInfo.userType === 1}}">
         <view class="info">
         <view class="info">
@@ -86,6 +87,7 @@
         </view>
         </view>
     </block>
     </block>
 
 
+    <view class="list">
         <!-- 券码核销 -->
         <!-- 券码核销 -->
         <view class="coupon-permissions row align-c" bindtap="goCouponInput" wx:if="{{isCouponPermissions}}">
         <view class="coupon-permissions row align-c" bindtap="goCouponInput" wx:if="{{isCouponPermissions}}">
             <view class="coupon-permissions-info col">
             <view class="coupon-permissions-info col">
@@ -232,7 +234,7 @@
                         <view class="card-list-item-cover">
                         <view class="card-list-item-cover">
                             <image mode="aspectFill" src="{{item.cover}}"></image>
                             <image mode="aspectFill" src="{{item.cover}}"></image>
                         </view>
                         </view>
-                    <view class="column">
+                        <view class="card-list-item-info column">
                             <text class="card-list-appointment-name">{{item.name}}</text>
                             <text class="card-list-appointment-name">{{item.name}}</text>
                             <text class="card-list-appointment-tip">{{item.quantity}}</text>
                             <text class="card-list-appointment-tip">{{item.quantity}}</text>
                         </view>
                         </view>
@@ -274,6 +276,7 @@
             <text>客服中心</text>
             <text>客服中心</text>
             <image class="icon" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
             <image class="icon" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
         </view>
         </view>
+    </view>
 </view>
 </view>
 
 
 <!-- 业主弹出层 -->
 <!-- 业主弹出层 -->

pages/mine/home/home.wxss

-page {
-    background: #F3F4F6;
-}
-
 .container {
 .container {
     min-height: 100vh;
     min-height: 100vh;
 }
 }
@@ -168,7 +164,7 @@ page {
     z-index: 2;
     z-index: 2;
     width: 670rpx;
     width: 670rpx;
     height: 176rpx;
     height: 176rpx;
-    margin-top: 48rpx;
+    margin: 48rpx 40rpx 0 40rpx;
     padding: 40rpx 32rpx;
     padding: 40rpx 32rpx;
     border-radius: 4px;
     border-radius: 4px;
     background: #FFFFFF;
     background: #FFFFFF;
@@ -190,6 +186,10 @@ page {
     color: #161a1f;
     color: #161a1f;
 }
 }
 
 
+.list {
+    background: #F3F4F6;
+}
+
 /* 我的订单，我的预约 */
 /* 我的订单，我的预约 */
 .card {
 .card {
     width: 670rpx;
     width: 670rpx;
@@ -424,11 +424,19 @@ page {
     margin: 0 32rpx 0 0;
     margin: 0 32rpx 0 0;
 }
 }
 
 
+.card-list-item-cover:nth-child(n + 4) {
+    display: none;
+}
+
 .card-list-item-cover > image {
 .card-list-item-cover > image {
     max-width: 100%;
     max-width: 100%;
     max-height: 100%;
     max-height: 100%;
 }
 }
 
 
+.card-list-item-info {
+    flex-grow: 1;
+}
+
 .card-list-item-date {
 .card-list-item-date {
     position: absolute;
     position: absolute;
     top: -28rpx;
     top: -28rpx;
@@ -610,7 +618,6 @@ page {
 }
 }
 
 
 /* 二期样式 */
 /* 二期样式 */
-
 .order-activity {
 .order-activity {
     width: 670rpx;
     width: 670rpx;
     margin-top: 48rpx;
     margin-top: 48rpx;
@@ -912,7 +919,7 @@ page {
 .service {
 .service {
     width: 670rpx;
     width: 670rpx;
     height: 128rpx;
     height: 128rpx;
-    margin-top: 48rpx;
+    margin: 48rpx 40rpx 64rpx 40rpx;
     padding: 0 32rpx;
     padding: 0 32rpx;
     background-color: #fff;
     background-color: #fff;
     border-radius: 4rpx;
     border-radius: 4rpx;

pages/mine/order/order.js

-const App = getApp()
-
+let App = getApp()
 Page({
 Page({
     data: {
     data: {
         imageBase: App.globalData.appImageBase,
         imageBase: App.globalData.appImageBase,
@@ -11,30 +10,31 @@ Page({
         orderType: [],
         orderType: [],
         orderTypeActive: 0,
         orderTypeActive: 0,
         isDoing: false,
         isDoing: false,
-        statusList: [{
+        tabItem: [{
                 'value': '',
                 'value': '',
-                'name': '全部'
+                'text': '全部'
             },
             },
             {
             {
                 'value': '0',
                 'value': '0',
-                'name': '待付款'
+                'text': '待付款'
             },
             },
             {
             {
                 'value': '2',
                 'value': '2',
-                'name': '待使用'
+                'text': '待使用'
             },
             },
             {
             {
                 'value': `-1','4`,
                 'value': `-1','4`,
-                'name': '取消/过期'
+                'text': '取消/过期'
             },
             },
         ],
         ],
         statusActive: 0,
         statusActive: 0,
         orderList: [],
         orderList: [],
         orderPages: 1,
         orderPages: 1,
         winOrderType: false,
         winOrderType: false,
-        isLoading: false,
-        isFinished: false,
-        optionsGoodType: ''
+        optionsGoodType: '',
+
+        cssCategoryTop: 0,
+        cssCategoryHeight: 0,
     },
     },
 
 
     onLoad: function (options) {
     onLoad: function (options) {
@@ -46,10 +46,11 @@ Page({
     },
     },
 
 
     onShow: function () {
     onShow: function () {
+        console.log(this.data.isDoing)
+
         this.setData({
         this.setData({
             orderPages: 1,
             orderPages: 1,
             orderList: [],
             orderList: [],
-            isFinished: false,
         })
         })
         this.setOrderType()
         this.setOrderType()
     },
     },
@@ -57,12 +58,14 @@ Page({
     setNavTop: function () {
     setNavTop: function () {
         let funcStatusHeight = wx.getStorageSync('navStatusHeight')
         let funcStatusHeight = wx.getStorageSync('navStatusHeight')
         let funcTitleHeight = wx.getStorageSync('navTitleHeight')
         let funcTitleHeight = wx.getStorageSync('navTitleHeight')
-        // 这个数值需要和 css 中的高度同步。
-        let funcCategoryHeight = 176
-    },
 
 
-    refresh: function () {
-        this.setOrderType()
+        let funcCategoryTop = (funcTitleHeight - 64 * wx.getStorageSync('unitProportion')) / 2 + funcStatusHeight
+        let funcCategoryHeight = funcCategoryTop + (64 + 58) * wx.getStorageSync('unitProportion')
+
+        this.setData({
+            cssCategoryTop: funcCategoryTop,
+            cssCategoryHeight: funcCategoryHeight,
+        })
     },
     },
 
 
     /**
     /**
@@ -73,30 +76,16 @@ Page({
      */
      */
     queryOrder: function () {
     queryOrder: function () {
         // 数据全部加载完成不再执行
         // 数据全部加载完成不再执行
-
-        if (this.data.isFinished) return
-        let that = this;
-        // let funcName = this.data.orderType[this.data.orderTypeActive].value
-        // let funcValue = this.data.statusList[this.data.statusActive].value
-        this.setData({
-            isLoading: true
-        })
         App.wxRequest({
         App.wxRequest({
             url: 'v1/order/getOrderList',
             url: 'v1/order/getOrderList',
             data: {
             data: {
                 'goodType': this.data.orderTypeActive ? this.data.orderType[this.data.orderTypeActive].value : '',
                 'goodType': this.data.orderTypeActive ? this.data.orderType[this.data.orderTypeActive].value : '',
-                'status': this.data.statusList[this.data.statusActive].value,
+                'status': this.data.tabItem[this.data.statusActive].value,
                 'pageSize': 10,
                 'pageSize': 10,
                 'pageNo': this.data.orderPages,
                 'pageNo': this.data.orderPages,
             },
             },
             success: (response) => {
             success: (response) => {
-                wx.hideLoading()
                 let funcResponse = response.data
                 let funcResponse = response.data
-                if (funcResponse.length < 10) {
-                    that.setData({
-                        isFinished: true
-                    })
-                }
                 let funcList = []
                 let funcList = []
                 for (let i = 0, l = funcResponse.length; i < l; i++) {
                 for (let i = 0, l = funcResponse.length; i < l; i++) {
                     let funcItem = {
                     let funcItem = {
@@ -123,7 +112,7 @@ Page({
                     let commodityBackup = []
                     let commodityBackup = []
                     for (let ii = 0, ll = funcCommodity.length; ii < ll; ii++) {
                     for (let ii = 0, ll = funcCommodity.length; ii < ll; ii++) {
                         let funcCommodityItem = {
                         let funcCommodityItem = {
-                            'cover': funcCommodity[ii].imgUrl,
+                            'cover': funcCommodity[ii].imgUrl ? funcCommodity[ii].imgUrl : this.data.resourcesBase + 'commodity/menu/commodity-item.png',
                             'name': funcCommodity[ii].name,
                             'name': funcCommodity[ii].name,
                             'quantity': funcCommodity[ii].number,
                             'quantity': funcCommodity[ii].number,
                             'price': funcCommodity[ii].unitPrice,
                             'price': funcCommodity[ii].unitPrice,
@@ -156,12 +145,10 @@ Page({
                     }
                     }
                     funcList.push(funcItem)
                     funcList.push(funcItem)
                 }
                 }
+
                 this.setData({
                 this.setData({
                     orderList: this.data.orderList.concat(funcList)
                     orderList: this.data.orderList.concat(funcList)
                 })
                 })
-                that.setData({
-                    isLoading: false
-                })
             }
             }
         })
         })
     },
     },
@@ -257,7 +244,6 @@ Page({
             'orderTypeActive': funcIndex,
             'orderTypeActive': funcIndex,
             'orderPages': 1,
             'orderPages': 1,
             'orderList': [],
             'orderList': [],
-            'isFinished': false
         })
         })
 
 
         this.queryOrder()
         this.queryOrder()
@@ -270,28 +256,9 @@ Page({
      *  @returns
      *  @returns
      */
      */
     onToBuy: function (event) {
     onToBuy: function (event) {
-        let commodityType = this.data.orderType[this.data.orderTypeActive].value
-        let shopAppId = wx.getStorageSync('shopInfoBuffer') ? wx.getStorageSync('shopInfoBuffer').appId : ""
-        wx.navigateTo({
-            url: `/pages/commodity/menu-food/menu-food?formPage=order&shopAppId=${shopAppId}&commodityType=${commodityType}`,
-        })
-    },
-
-    /**
-     *  订单状态
-     *  @function
-     *  @param {object} - event
-     *  @returns
-     */
-    onSelectionStatus: function (event) {
-        this.setData({
-            'isFinished': false,
-            'statusActive': Number(event.currentTarget.dataset.type),
-            'orderPages': 1,
-            'orderList': [],
+        wx.switchTab({
+            url: '/pages/commodity/home/home',
         })
         })
-
-        this.queryOrder()
     },
     },
 
 
     onNavigationBack: function () {
     onNavigationBack: function () {
@@ -336,6 +303,8 @@ Page({
      *  @returns
      *  @returns
      */
      */
     onOrderCancel: function (event) {
     onOrderCancel: function (event) {
+        console.log('onOrderCancel')
+        
         App.ui.showDialog({
         App.ui.showDialog({
             type: 'confirm',
             type: 'confirm',
             title: '是否确认取消订单',
             title: '是否确认取消订单',
@@ -484,11 +453,7 @@ Page({
                 },
                 },
                 fail(res) {}
                 fail(res) {}
             })
             })
-
         }
         }
-
-
-
     },
     },
 
 
     /**
     /**
@@ -508,10 +473,9 @@ Page({
      *  @returns
      *  @returns
      */
      */
     onOrderEvaluate: function (event) {
     onOrderEvaluate: function (event) {
-
-        let item = JSON.stringify(event.currentTarget.dataset.item)
+        let funcId = event.currentTarget.dataset.item.id
         wx.navigateTo({
         wx.navigateTo({
-            url: `/pages/pay/order-comment/order-comment?orderItem=${item}&pageFrom=orderList`,
+            url: '/pages/pay/order-comment/order-comment?pageFrom=orderList&id=' + funcId
         })
         })
     },
     },
     /**
     /**
@@ -599,6 +563,23 @@ Page({
     },
     },
 
 
     /**
     /**
+     *  订单状态
+     *  @function
+     *  @param {object} - event
+     *  @returns
+     */
+    eventTabChange: function (funcEvent) {
+        console.log(funcEvent)
+
+        this.setData({
+            'statusActive': funcEvent.detail.index,
+            'orderPages': 1,
+            'orderList': [],
+        })
+        this.queryOrder()
+    },
+
+    /**
      *  页面触底事件
      *  页面触底事件
      *  @function
      *  @function
      *  @param
      *  @param

pages/mine/order/order.wxml

@@ -2,31 +2,31 @@
 <m-dialog></m-dialog>
 <m-dialog></m-dialog>
 
 
 <!-- 订单分类选择 -->
 <!-- 订单分类选择 -->
-<view class="order-category row con-b align-c">
+<view class="order-category row as" style="{{'height: ' + cssCategoryHeight + 'px;padding-top: ' + cssCategoryTop + 'px;'}}">
+    <view class="row cb ac">
         <image src="{{imageBase + 'icon/arrow-l-1.png'}}" bindtap="onNavigationBack"></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 ac" 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>
         </view>
         </view>
-    <image src=""></image>
+        <image></image>
+    </view>
 </view>
 </view>
 
 
 <!-- 订单状态选择 -->
 <!-- 订单状态选择 -->
-<view class="order-type-selection col" wx:if="{{winOrderType}}" bindtap="onOrderType">
+<view class="order-type-selection column" wx:if="{{winOrderType}}" bindtap="onOrderType">
     <view>
     <view>
-        <view class="order-type-row row con-b align-c">
+        <view class="order-type-row row cb ac">
             <block wx:for="{{orderType}}" wx:for-index="index" wx:for-item="item" wx:key="index">
             <block wx:for="{{orderType}}" wx:for-index="index" wx:for-item="item" wx:key="index">
-                <view wx:if="{{index < 3}}"
-                    class="order-type-item row con-c align-c {{orderTypeActive === index ? 'order-type-item-active' : ''}}"
-                    data-item="{{item}}" data-index="{{index}}" bindtap="onOrderTypeSelection">
+                <view wx:if="{{index < 3}}" class="order-type-item row con-c ac {{orderTypeActive === index ? 'order-type-item-active' : ''}}" data-item="{{item}}" data-index="{{index}}" bindtap="onOrderTypeSelection">
                     <text>{{item.name}}</text>
                     <text>{{item.name}}</text>
                 </view>
                 </view>
             </block>
             </block>
         </view>
         </view>
-        <view class="order-type-row row con-b align-c">
+        <view class="order-type-row row cb ac">
             <block wx:for="{{orderType}}" wx:for-index="index" wx:for-item="item" wx:key="index">
             <block wx:for="{{orderType}}" wx:for-index="index" wx:for-item="item" wx:key="index">
                 <view wx:if="{{3 <= index && index < 6}}"
                 <view wx:if="{{3 <= index && index < 6}}"
-                    class="order-type-item row con-c align-c {{orderTypeActive === index ? 'order-type-item-active' : ''}}"
+                    class="order-type-item row con-c ac {{orderTypeActive === index ? 'order-type-item-active' : ''}}"
                     data-item="{{item}}" data-index="{{index}}" bindtap="onOrderTypeSelection">
                     data-item="{{item}}" data-index="{{index}}" bindtap="onOrderTypeSelection">
                     <text>{{item.name}}</text>
                     <text>{{item.name}}</text>
                 </view>
                 </view>
@@ -35,22 +35,16 @@
     </view>
     </view>
 </view>
 </view>
 
 
+<m-tab item="{{tabItem}}" itemClass="tab-item" isFixed="{{true}}" isOccupy="{{false}}" fixedTop="{{cssCategoryHeight}}" bindtabChange="eventTabChange"></m-tab>
+
 <!-- 订单列表 -->
 <!-- 订单列表 -->
-<view class="container-order">
-    <view class="status row con-b align-c fixed-tab">
-        <block wx:for="{{statusList}}" wx:for-index="index" wx:for-item="item" wx:key="index">
-            <view class="status-item row con-c align-c {{index === statusActive ? 'status-item-active' : ''}}"
-                data-type="{{index}}" bindtap="onSelectionStatus">
-                <text>{{item.name}}</text>
-            </view>
-        </block>
-    </view>
-    <block wx:if="{{orderList.length>0}}">
-        <view class="order-list col con-c align-c">
+<view class="container bg-gradient" style="{{'margin-top: ' + (cssCategoryHeight + cssCategoryTop + 10) + 'px;'}}">
+    <block wx:if="{{orderList.length > 0}}">
+        <view class="order-list column con-c ac">
             <block wx:for="{{orderList}}" wx:for-index="index" wx:for-item="item" wx:key="index">
             <block wx:for="{{orderList}}" wx:for-index="index" wx:for-item="item" wx:key="index">
-                <view class="order-list-item col align-c" data-item="{{item}}" bindtap="onOrderDetail">
-                    <view class="order-list-item-title row con-b align-c">
-                        <view class="row align-c">
+                <view class="order-list-item column ac" data-item="{{item}}" bindtap="onOrderDetail">
+                    <view class="order-list-item-title row cb ac">
+                        <view class="row ac">
                             <view class="logo-box">
                             <view class="logo-box">
                                 <image wx:if="{{item.shopLogo}}" src="{{resourcesBase + item.shopLogo}}" mode="aspectFit"></image>
                                 <image wx:if="{{item.shopLogo}}" src="{{resourcesBase + item.shopLogo}}" mode="aspectFit"></image>
                             </view>
                             </view>
@@ -67,16 +61,16 @@
                     </view>
                     </view>
 
 
                     <!-- 商品数量样式一 -->
                     <!-- 商品数量样式一 -->
-                    <view class="order-list-item-service row con-b align-c" wx:if="{{item.commodity.length === 1}}">
+                    <view class="order-list-item-service row cb ac" wx:if="{{item.commodity.length === 1}}">
                         <image class="cover" src="{{item.commodity[0].cover}}"></image>
                         <image class="cover" src="{{item.commodity[0].cover}}"></image>
                         <text class="name">{{item.commodity[0].name}}</text>
                         <text class="name">{{item.commodity[0].name}}</text>
                         <text class="total">{{'x ' + item.total}}</text>
                         <text class="total">{{'x ' + item.total}}</text>
                     </view>
                     </view>
                     <!-- 商品数量样式二 -->
                     <!-- 商品数量样式二 -->
-                    <view class="order-list-item-service row con-b align-c" wx:if="{{item.commodity.length >= 2}}">
+                    <view class="order-list-item-service row cb ac" wx:if="{{item.commodity.length >= 2}}">
                         <block wx:if="{{item.commodity.length>3}}">
                         <block wx:if="{{item.commodity.length>3}}">
-                            <block wx:for="{{item.commoditySlice3}}" wx:for-index="commodityIndex" wx:for-item="commodityItem"
-                                wx:key="commodityIndex">
+                            <block wx:for="{{item.commoditySlice3}}" wx:for-index="commodityIndex"
+                                wx:for-item="commodityItem" wx:key="commodityIndex">
                                 <image class="cover" src="{{commodityItem.cover}}"></image>
                                 <image class="cover" src="{{commodityItem.cover}}"></image>
                             </block>
                             </block>
                         </block>
                         </block>
@@ -89,58 +83,53 @@
 
 
                         <text class="total">{{'共 ' + item.commodityBackup.length + ' 件'}}</text>
                         <text class="total">{{'共 ' + item.commodityBackup.length + ' 件'}}</text>
                     </view>
                     </view>
-                    <view class="order-list-item-operation row con-b align-c">
-                        <view class="row align-c">
+                    <view class="order-list-item-operation row cb ac">
+                        <view class="row ac">
                             <text class="amount">实付:</text>
                             <text class="amount">实付:</text>
                             <text class="amount">¥{{item.amount}}</text>
                             <text class="amount">¥{{item.amount}}</text>
                         </view>
                         </view>
-                        <view class="row align-c">
-                            <button wx:if="{{item.status === 0}}" class="delete row con-c align-c" data-index="{{index}}" data-item="{{item}}" catchtap="onOrderCancel" disabled="{{isDoing}}">取消订单</button>
-                            <button disabled="{{isDoing}}" wx:if="{{item.status === -1 || item.status === 4}}" class="delete row con-c align-c" data-item="{{item}}" catchtap="onOrderRemove">删除订单</button>
-                            <button disabled="{{isDoing}}" wx:if="{{item.status === 0}}" class="again row con-c align-c" data-item="{{item}}" catchtap="onOrderPay">去支付</button>
-                            <button disabled="{{isDoing}}" wx:if="{{item.status === 2}}" class="again row con-c align-c" data-item="{{item}}" catchtap="onOrderUse">去使用</button>
-                            <button disabled="{{isDoing}}" wx:if="{{item.status === 3}}" class="again row con-c align-c" data-item="{{item}}" catchtap="onOrderEvaluate">去评价</button>
-                            <button disabled="{{isDoing}}" wx:if="{{item.status === -1}}" class="again row con-c align-c" data-item="{{item}}" catchtap="onOrderAgain">再次下单</button>
+                        <view class="row ac">
+                            <button wx:if="{{item.status === 0}}" class="delete row con-c ac" data-index="{{index}}" data-item="{{item}}" catchtap="onOrderCancel" disabled="{{isDoing}}">取消订单</button>
+                            <button disabled="{{isDoing}}" wx:if="{{item.status === -1 || item.status === 4}}" class="delete row con-c ac" data-item="{{item}}" catchtap="onOrderRemove">删除订单</button>
+                            <button disabled="{{isDoing}}" wx:if="{{item.status === 0}}" class="again row con-c ac" data-item="{{item}}" catchtap="onOrderPay">去支付</button>
+                            <button disabled="{{isDoing}}" wx:if="{{item.status === 2}}" class="again row con-c ac" data-item="{{item}}" catchtap="onOrderUse">去使用</button>
+                            <button disabled="{{isDoing}}" wx:if="{{item.status === 3}}" class="again row con-c ac" data-item="{{item}}" catchtap="onOrderEvaluate">去评价</button>
+                            <button disabled="{{isDoing}}" wx:if="{{item.status === -1}}" class="again row con-c ac" data-item="{{item}}" catchtap="onOrderAgain">再次下单</button>
                         </view>
                         </view>
                     </view>
                     </view>
                 </view>
                 </view>
             </block>
             </block>
         </view>
         </view>
     </block>
     </block>
-    <block wx:else>
-        <view class="empty col con-c align-c" wx:if="{{!isLoading}}">
-            <image class="empty-cart" src=""></image>
-            <view class="empty-title">
-                <text>{{ statusActive!=0? '暂无相关订单':'暂无订单'}}</text>
-            </view>
-            <view class="empty-btn" bindtap="onToBuy" wx:if="{{statusActive===0}}">
-                <text>去逛逛</text>
-            </view>
+    <block wx:if="{{orderList.length === 0}}">
+        <view class="empty column cc ac" wx:if="{{!isLoading}}">
+            <text>{{ statusActive !== 0 ? '暂无相关订单' : '暂无订单'}}</text>
+            <button class="row cc ac" wx:if="{{statusActive === 0}}" bindtap="onToBuy">去逛逛</button>
         </view>
         </view>
     </block>
     </block>
 </view>
 </view>
 
 
 <!-- 二维码弹窗 -->
 <!-- 二维码弹窗 -->
-<view class="code-mask row con-c align-c" wx:if="{{winCode}}">
-    <view class="code col con-c align-c">
-        <view class="code-tip col con-c align-c">
+<view class="code-mask row con-c ac" wx:if="{{winCode}}">
+    <view class="code column con-c ac">
+        <view class="code-tip column con-c ac">
             <text>{{'请将券码出示给门店核销人员'}}</text>
             <text>{{'请将券码出示给门店核销人员'}}</text>
             <text>{{'请将券码出示给门店核销人员'}}</text>
             <text>{{'请将券码出示给门店核销人员'}}</text>
         </view>
         </view>
-        <view class="code-info col con-c align-c">
+        <view class="code-info column con-c ac">
             <view class="code-info-title">
             <view class="code-info-title">
                 <text>{{'《 阿凡达 》电影票'}}</text>
                 <text>{{'《 阿凡达 》电影票'}}</text>
             </view>
             </view>
             <view class="code-info-qrcode">
             <view class="code-info-qrcode">
                 <image src="{{'data:image/png;base64,' + code.codeBase64}}"></image>
                 <image src="{{'data:image/png;base64,' + code.codeBase64}}"></image>
             </view>
             </view>
-            <view class="code-info-copy row con-b align-c">
+            <view class="code-info-copy row cb ac">
                 <text>券码</text>
                 <text>券码</text>
                 <text>{{'2719 7092 0925'}}</text>
                 <text>{{'2719 7092 0925'}}</text>
                 <text>复制</text>
                 <text>复制</text>
             </view>
             </view>
         </view>
         </view>
-        <view class="code-close row con-c align-c" bindtap="onCodeClose">
+        <view class="code-close row con-c ac" bindtap="onCodeClose">
             <image src="{{imageBase + 'icon/close-1.png'}}"></image>
             <image src="{{imageBase + 'icon/close-1.png'}}"></image>
         </view>
         </view>
     </view>
     </view>

pages/mine/order/order.wxss

-page {
-    min-height: 100vh;
-    background: #f3f4f6;
-}
-
-.fixed-tab {
-    z-index: 3;
-    position: fixed;
-    top: 176rpx;
-    background: #fff;
-}
-
+/* 订单分类 */
 .order-category {
 .order-category {
     z-index: 3;
     z-index: 3;
     position: fixed;
     position: fixed;
     top: 0;
     top: 0;
     left: 0;
     left: 0;
     width: 750rpx;
     width: 750rpx;
-    height: 176rpx;
     background: #fff;
     background: #fff;
 }
 }
 
 
-.order-category image {
+.order-category > view {
+    width: 750rpx;
+}
+
+.order-category > view > image {
     width: 50rpx;
     width: 50rpx;
     height: 50rpx;
     height: 50rpx;
+    margin-left: 16rpx;
 }
 }
 
 
 .order-type {
 .order-type {
     width: 200rpx;
     width: 200rpx;
     height: 64rpx;
     height: 64rpx;
     border-radius: 32rpx;
     border-radius: 32rpx;
-    border: 0.5px solid #e2e7ef;
+    border: 1px solid #e2e7ef;
 }
 }
 
 
 .order-type text {
 .order-type text {
@@ -43,9 +36,8 @@ page {
 }
 }
 
 
 /* 订单类型选择 */
 /* 订单类型选择 */
-
 .order-type-selection {
 .order-type-selection {
-    z-index: 4;
+    z-index: 7;
     position: fixed;
     position: fixed;
     top: 176rpx;
     top: 176rpx;
     left: 0;
     left: 0;
@@ -84,41 +76,22 @@ page {
     color: #fff;
     color: #fff;
 }
 }
 
 
-.container-order {
-    /* margin-top: 170rpx; */
-    padding-top: 288rpx;
-}
-
-.container {
-    position: relative;
-}
-
-/* 状态筛选菜单 */
-
-.status {
-    width: 750rpx;
-    height: 112rpx;
-    padding: 0 34rpx 1rpx 64rpx;
-    border-bottom: 0.5px #e2e7ef solid;
+/* 订单状态 */
+.tab-item {
+    width: 122rpx;
+    margin: 0 30rpx !important;
 }
 }
 
 
-.status-item {
-    height: 112rpx;
-    font-size: 26rpx;
-    font-weight: 400;
-    line-height: 36rpx;
-    border-bottom: 4px rgba(0, 0, 0, 0) solid;
-    color: #959da9;
+.tab-item:first-child {
+    margin-left: 0 !important;
 }
 }
 
 
-.status-item-active {
-    height: 112rpx;
-    border-bottom: 4px #000 solid;
-    color: #000;
+.container {
+    position: relative;
+    min-height: 100vh;
 }
 }
 
 
 /* 订单列表 */
 /* 订单列表 */
-
 .order-list {
 .order-list {
     width: 750rpx;
     width: 750rpx;
     height: 100%;
     height: 100%;
@@ -196,7 +169,7 @@ page {
     width: 120rpx;
     width: 120rpx;
     height: 56rpx;
     height: 56rpx;
     border-radius: 4rpx;
     border-radius: 4rpx;
-    border: 0.5px solid #c2c7cf;
+    border: 1px solid #c2c7cf;
     font-size: 22rpx;
     font-size: 22rpx;
     font-weight: 500;
     font-weight: 500;
     line-height: 32rpx;
     line-height: 32rpx;
@@ -311,29 +284,32 @@ page {
     height: 48rpx;
     height: 48rpx;
 }
 }
 
 
-.empty-cart {
-    width: 176rpx;
-    height: 176rpx;
-    /* background-color: #ccc; */
+.empty {
+    width: 308rpx;
+    height: 216rpx;
+    margin-top: 440rpx;
 }
 }
 
 
-.empty-title {
-    margin-top: 64rpx;
-    color: #959da9;
+.empty > text {
+    height: 52rpx;
     font-size: 38rpx;
     font-size: 38rpx;
+    font-weight: 500;
     line-height: 52rpx;
     line-height: 52rpx;
+    color: #959DA9;
 }
 }
 
 
-.empty-btn {
+.empty > button {
     width: 308rpx;
     width: 308rpx;
     height: 96rpx;
     height: 96rpx;
-    margin-top: 68rpx;
-    color: #fff;
+    margin: 38rpx 0 0 0;
+    border-radius: 4px;
+    background: #86C5E1;
+    
+    
     font-size: 30rpx;
     font-size: 30rpx;
     line-height: 96rpx;
     line-height: 96rpx;
     text-align: center;
     text-align: center;
-    background: #86c5e1;
-    border-radius: 4rpx;
+    color: #fff;
 }
 }
 
 
 .logo-box {
 .logo-box {

pages/mine/question-more/question-more.wxss

@@ -33,7 +33,7 @@
 .content-item {
 .content-item {
     width: 100%;
     width: 100%;
     height: auto;
     height: auto;
-    border-bottom: 0.5px solid rgb(247, 246, 247);
+    border-bottom: 1px solid rgb(247, 246, 247);
 }
 }
 
 
 .circle {
 .circle {

pages/mine/question/question.wxss

@@ -12,7 +12,7 @@
     display: flex;
     display: flex;
     align-items: center;
     align-items: center;
     justify-content: space-around;
     justify-content: space-around;
-    border-top: 0.5px solid rgb(244, 242, 244);
+    border-top: 1px solid rgb(244, 242, 244);
     background-color: white;
     background-color: white;
 }
 }
 
 
@@ -200,7 +200,7 @@
 .content-item {
 .content-item {
     width: 100%;
     width: 100%;
     height: auto;
     height: auto;
-    border-bottom: 0.5px solid rgb(247, 246, 247);
+    border-bottom: 1px solid rgb(247, 246, 247);
 }
 }
 
 
 /* .circle{
 /* .circle{

pages/pay/coupon-detail/coupon-detail.js

 let App = getApp()
 let App = getApp()
 Page({
 Page({
     data: {
     data: {
+        imageBase: App.globalData.appImageBase,
+        resourcesBase: App.globalData.appResourcesBase,
+        
         orderType: 1, // 1 - 年卡/月卡，2 - 次票， 3 - SPA， 4 - 文创， 5 - 餐品， 6 - 活动， 7 - 观影
         orderType: 1, // 1 - 年卡/月卡，2 - 次票， 3 - SPA， 4 - 文创， 5 - 餐品， 6 - 活动， 7 - 观影
         couponInfo: null,
         couponInfo: null,
         goodsList: null,
         goodsList: null,
@@ -10,19 +13,22 @@ Page({
         couponDetail: null,
         couponDetail: null,
     },
     },
     onLoad: function (options) {
     onLoad: function (options) {
+        console.log(this)
         if (options.couponDetail) {
         if (options.couponDetail) {
             let data = JSON.parse(options.couponDetail)
             let data = JSON.parse(options.couponDetail)
             let tmpGoodsList = [];
             let tmpGoodsList = [];
-            data.smOrderDetails.forEach(item => {
-                var tmpItem = {
-                    id: item.commodityId,
-                    cover: item.imgUrl,
-                    name: item.name,
-                    quantity: item.number,
-                    price: item.totalPrices,
+
+            for (let i = 0, l = data.smOrderDetails.length; i < l; i++) {
+                let funcItem = {
+                    id: data.smOrderDetails[i].commodityId,
+                    cover: data.smOrderDetails[i].imgUrl ? data.smOrderDetails[i].imgUrl : this.data.resourcesBase + 'commodity/menu/commodity-item.png',
+                    name: data.smOrderDetails[i].name,
+                    quantity: data.smOrderDetails[i].number,
+                    price: data.smOrderDetails[i].totalPrices,
                 }
                 }
-                tmpGoodsList.push(tmpItem)
-            })
+                tmpGoodsList.push(funcItem)
+            }
+
             let tmpUserList = [];
             let tmpUserList = [];
             data.smPersonalDetails.forEach(item => {
             data.smPersonalDetails.forEach(item => {
                 var tmpItem = {
                 var tmpItem = {
@@ -52,18 +58,18 @@ Page({
 
 
     // 确认核销'
     // 确认核销'
     submitOperation() {
     submitOperation() {
-        wx.lin.showDialog({
-            type: "confirm",
-            title: "",
-            content: "是否确认核销券码",
-            success: (res) => {
-                if (res.confirm) {
-                    console.log('用户点击确定')
+        App.ui.showDialog({
+            type: 'confirm',
+            title: '是否确认核销券码',
+            content: '',
+            cancel: '取消',
+            confirm: '确认',
+            success: () => {
                 this.doVolume()
                 this.doVolume()
-                } else if (res.cancel) {
-                    console.log('用户点击取消')
-                }
-            }
+            },
+            fail: () => {
+                console.log('fail')
+            },
         })
         })
     },
     },
 
 
@@ -81,8 +87,8 @@ Page({
             },
             },
             success: (res) => {
             success: (res) => {
                 if (res.data && res.data.code * 1 == 500) {
                 if (res.data && res.data.code * 1 == 500) {
-                    wx.lin.showToast({
-                        image: '/image/error.png',
+                    App.ui.showToast({
+                        iconType: 'error',
                         title: res.data.msg,
                         title: res.data.msg,
                     })
                     })
                 } else {
                 } else {

pages/pay/coupon-detail/coupon-detail.wxml

-<m-dialog></m-dialog>
 <m-toast></m-toast>
 <m-toast></m-toast>
-<m-nav titleText="券码核销"></m-nav>
+<m-dialog></m-dialog>
+<m-nav titleText="券码核销" styleIndex="{{1}}"></m-nav>
 <view class="container">
 <view class="container">
     <view class="list-wrapper">
     <view class="list-wrapper">
         <view class="title-wrapper">兑换券信息</view>
         <view class="title-wrapper">兑换券信息</view>

pages/pay/coupon-detail/coupon-detail.wxss

@@ -24,7 +24,7 @@
     color: #15191f;
     color: #15191f;
     font-size: 30rpx;
     font-size: 30rpx;
     line-height: 96rpx;
     line-height: 96rpx;
-    border-bottom: 0.5px solid #e2e7ef;
+    border-bottom: 1px solid #e2e7ef;
 }
 }
 
 
 .info-wrapper:last-child {
 .info-wrapper:last-child {
@@ -85,6 +85,7 @@
     height: 164rpx;
     height: 164rpx;
     padding: 32rpx 40rpx;
     padding: 32rpx 40rpx;
     border-top: 1px solid #e2e7ef;
     border-top: 1px solid #e2e7ef;
+    background: #FFFFFF;
 }
 }
 
 
 .footer-btn {
 .footer-btn {
@@ -106,7 +107,7 @@
 .cancel-btn {
 .cancel-btn {
     color: #656e7b;
     color: #656e7b;
     background-color: #fff;
     background-color: #fff;
-    border: 0.5rpx solid #c2c7cf;
+    border: 1px solid #c2c7cf;
 }
 }
 
 
 .confirm-btn {
 .confirm-btn {

pages/pay/coupon-input/coupon-input.js

 let App = getApp()
 let App = getApp()
 Page({
 Page({
     data: {
     data: {
+        imageBase: App.globalData.appImageBase,
+        resourcesBase: App.globalData.appResourcesBase,
+        
         bgUrl: '/pages/mine/home/image/mine.png',
         bgUrl: '/pages/mine/home/image/mine.png',
         avatarUrl: '/pages/mine/home/image/avatar.png',
         avatarUrl: '/pages/mine/home/image/avatar.png',
         name: '姓名',
         name: '姓名',
@@ -48,36 +51,48 @@ Page({
             })
             })
             return
             return
         }
         }
-        let that = this
-
         App.ui.showToast({
         App.ui.showToast({
             iconType: 'loading',
             iconType: 'loading',
             title: '正在识别',
             title: '正在识别',
             duration: 60000
             duration: 60000
         })
         })
-        App.wxRequest({
+
+        App.request({
             url: 'v1/volume/getVolumeDetails',
             url: 'v1/volume/getVolumeDetails',
-            data: {
-                serialNumber: couponCode,
+            params: {
+                'serialNumber': couponCode,
             },
             },
-            success: function(res) {
+        }).then((response) => {
             App.ui.hideToast()
             App.ui.hideToast()
-                let couponDetail = JSON.stringify(res.data)
+            let couponDetail = JSON.stringify(response.data)
             wx.navigateTo({
             wx.navigateTo({
                 url: '/pages/pay/coupon-detail/coupon-detail?couponDetail=' + couponDetail,
                 url: '/pages/pay/coupon-detail/coupon-detail?couponDetail=' + couponDetail,
             })
             })
-            },
-            fail: function(err) {
+        }).catch((response) => {
+            switch (response.code) {
+                case 500:
                     App.ui.hideToast()
                     App.ui.hideToast()
                     App.ui.showDialog({
                     App.ui.showDialog({
                         type: 'tip',
                         type: 'tip',
-                    title: err.msg,
+                        title: response.message,
                         cancel: '取消',
                         cancel: '取消',
                         confirm: '确定',
                         confirm: '确定',
                         success: () => {},
                         success: () => {},
                         fail: () => {},
                         fail: () => {},
                     })
                     })
+                    break
             }
             }
+            console.log(response)
         })
         })
-    }
+    },
+
+    /**
+     *  页面滚动事件
+     *  @function
+     *  @param {object} - funcEvent
+     *  @returns
+     */
+    onPageScroll: function (funcEvent) {
+        App.pageScroll(funcEvent, this)
+    },
 })
 })
\ No newline at end of file

pages/pay/coupon-input/coupon-input.wxml

 <m-toast></m-toast>
 <m-toast></m-toast>
-<m-dialog show="{{showDialog}}" title="{{showDialogSmg}}"></m-dialog>
-<m-nav titleText="券码核销"></m-nav>
+<m-dialog></m-dialog>
+<m-nav titleText="券码核销" scrollHeight="{{navScroll}}" isOccupy="{{false}}"></m-nav>
 
 
 <view class="container">
 <view class="container">
     <!-- 头像信息 -->
     <!-- 头像信息 -->
-    <view class="header col align-c">
+    <view class="header column align-c">
         <view class="header-bg">
         <view class="header-bg">
-            <image src="{{bgUrl}}"></image>
+            <image src="{{resourcesBase + 'mine/admin-bgi.png'}}"></image>
         </view>
         </view>
         <view class="header-avatar">
         <view class="header-avatar">
             <l-avatar size="160" src="{{avatarUrl}}"></l-avatar>
             <l-avatar size="160" src="{{avatarUrl}}"></l-avatar>
         </view>
         </view>
         <view class="header-info">
         <view class="header-info">
             <view class="info-name">{{name}}</view>
             <view class="info-name">{{name}}</view>
-            <view class="info-text col con-b">
-                <view class="row con-b">
+            <view class="info-text column con-b">
+                <view class="row">
                     <text class="info-left">工作身份</text>
                     <text class="info-left">工作身份</text>
                     <text class="info-right">{{idString}}</text>
                     <text class="info-right">{{idString}}</text>
                 </view>
                 </view>
-                <view class="row con-b">
+                <view class="row">
                     <text class="info-left">所属门店</text>
                     <text class="info-left">所属门店</text>
                     <text class="info-right">{{shop}}</text>
                     <text class="info-right">{{shop}}</text>
                 </view>
                 </view>
@@ -38,7 +38,7 @@
         </view>
         </view>
         <view class="scan-text" bindtap="handleCouponScan">扫码核销</view>
         <view class="scan-text" bindtap="handleCouponScan">扫码核销</view>
         <view class="scan-right">
         <view class="scan-right">
-            <image mode="widthFix" src="/image/more-g.png"></image>
+            <image mode="widthFix" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
         </view>
         </view>
     </view>
     </view>
 </view>
 </view>
\ No newline at end of file

pages/pay/coupon-input/coupon-input.wxss

 .header-bg {
 .header-bg {
     width: 750rpx;
     width: 750rpx;
     height: 774rpx;
     height: 774rpx;
-    background-color: #ccc;
 }
 }
 .header-avatar {
 .header-avatar {
     position: absolute;
     position: absolute;
@@ -33,7 +32,7 @@
 .info-right {
 .info-right {
     color: #15191F;
     color: #15191F;
     font-size: 26rpx;
     font-size: 26rpx;
-    margin-left: 10rpx;
+    margin-left: 24rpx;
 }
 }
 .coupon-input-wrapper {
 .coupon-input-wrapper {
     width: 668rpx;
     width: 668rpx;
@@ -47,7 +46,7 @@
     padding: 0 22rpx 0 24rpx;
     padding: 0 22rpx 0 24rpx;
     font-size: 30rpx;
     font-size: 30rpx;
     line-height: 80rpx;
     line-height: 80rpx;
-    border: 0.5px solid #DBDFE5;
+    border: 1px solid #DBDFE5;
     border-radius: 4rpx;
     border-radius: 4rpx;
 }
 }
 .coupon-input-btn {
 .coupon-input-btn {

pages/pay/order-comment/order-comment.js

 let App = getApp()
 let App = getApp()
-
 Page({
 Page({
     data: {
     data: {
         shopConfig: App.globalData.shopId,
         shopConfig: App.globalData.shopId,
@@ -22,16 +21,20 @@ Page({
         fileResults: []
         fileResults: []
     },
     },
     onLoad: function (options) {
     onLoad: function (options) {
+        console.log(options)
   
   
         let pageFrom = options.pageFrom
         let pageFrom = options.pageFrom
-        let orderItem = JSON.parse(options.orderItem)
         this.setData({
         this.setData({
-            orderInfo: orderItem,
+            orderInfo: Object.assign(this.data.orderInfo, { 'id': options.id }),
             pageFrom: pageFrom
             pageFrom: pageFrom
         })
         })
         if (pageFrom == 'activityList') {
         if (pageFrom == 'activityList') {
             this.queryOrderDetail()
             this.queryOrderDetail()
         }
         }
+
+        if (pageFrom == 'orderList') {
+            this.queryOrderDetail()
+        }
     },
     },
 
 
     /**
     /**
@@ -45,12 +48,12 @@ Page({
         App.wxRequest({
         App.wxRequest({
             url: 'v1/order/getOrderDetail',
             url: 'v1/order/getOrderDetail',
             data: {
             data: {
-                'orderId': this.data.orderInfo.orderId
+                'orderId': this.data.orderInfo.id
             },
             },
             success: (response) => {
             success: (response) => {
                 let funcResponse = response.data
                 let funcResponse = response.data
                 let funcOrderInfo = {
                 let funcOrderInfo = {
-                    'id': this.data.orderInfo.orderId,
+                    'id': this.data.orderInfo.id,
                     'score': funcResponse.integral, // 积分
                     'score': funcResponse.integral, // 积分
                     'state': Number(funcResponse.status), // 订单状态
                     'state': Number(funcResponse.status), // 订单状态
                     'amount': funcResponse.totalMoney, // 实付金额
                     'amount': funcResponse.totalMoney, // 实付金额
@@ -76,7 +79,6 @@ Page({
                     }
                     }
                 )
                 )
                 funcOrderInfo.shopInfo = shopFilter[0]
                 funcOrderInfo.shopInfo = shopFilter[0]
-                console.log(shopFilter[0], '-----------shopFilter[0]------');
                 // 添加订单商品列表
                 // 添加订单商品列表
                 let funcCommodity = funcResponse.smOrderDetails
                 let funcCommodity = funcResponse.smOrderDetails
                 for (let i = 0, l = funcCommodity.length; i < l; i++) {
                 for (let i = 0, l = funcCommodity.length; i < l; i++) {
@@ -106,8 +108,6 @@ Page({
                                 residuePayTime: residuePayTime
                                 residuePayTime: residuePayTime
                             })
                             })
                         } else {
                         } else {
-
-                            console.log(residueStamp, 'residueStamp----------------');
                             clearInterval(timeInter)
                             clearInterval(timeInter)
 
 
                             // that.queryOrderDetail()
                             // that.queryOrderDetail()
@@ -144,7 +144,6 @@ Page({
             index,
             index,
             type
             type
         } = event.currentTarget.dataset
         } = event.currentTarget.dataset
-        console.log(index, type)
         let {
         let {
             scoreServe,
             scoreServe,
             scoreProduct,
             scoreProduct,
@@ -189,8 +188,6 @@ Page({
      *  @returns
      *  @returns
      */
      */
     eventImagePreview: function (event) {
     eventImagePreview: function (event) {
-        // console.log(event.detail)
-        console.log(9898);
         // let imgUrl = event.detail.all[0].url
         // let imgUrl = event.detail.all[0].url
         // let imgUrls = []
         // let imgUrls = []
         // imgUrls.push(imgUrl)
         // imgUrls.push(imgUrl)
@@ -239,7 +236,6 @@ Page({
         }
         }
     },
     },
     doInputContent: function (event) {
     doInputContent: function (event) {
-        console.log(event);
         this.setData({
         this.setData({
             content:event.detail.value
             content:event.detail.value
         })
         })

pages/pay/order-comment/order-comment.wxss

@@ -26,6 +26,10 @@
     background-color: #ccc;
     background-color: #ccc;
 }
 }
 
 
+.order-cover:nth-child(n + 4) {
+    display: none;
+}
+
 .order-name {
 .order-name {
     width: 274rpx;
     width: 274rpx;
     margin-left: 16rpx;
     margin-left: 16rpx;
@@ -160,10 +164,10 @@
     left: 0;
     left: 0;
     bottom: 0;
     bottom: 0;
     width: 750rpx;
     width: 750rpx;
-    height: 194rpx;
-    padding: 30rpx 40rpx 0;
+    height: 160rpx;
+    padding: 32rpx 40rpx;
     background-color: #fff;
     background-color: #fff;
-    border-top: 0.5px solid #e2e7ef;
+    border-top: 1px solid #e2e7ef;
     z-index: 100;
     z-index: 100;
 }
 }
 
 

pages/pay/order-detail/order-detail.js

@@ -37,11 +37,12 @@ Page({
             isFromUse: options.showCode === 'true' ? true : false,
             isFromUse: options.showCode === 'true' ? true : false,
             marginTop: wx.getStorageSync('navStatusHeight') + wx.getStorageSync('navTitleHeight')
             marginTop: wx.getStorageSync('navStatusHeight') + wx.getStorageSync('navTitleHeight')
         })
         })
+        console.log('1111')
+        console.log(this.data.orderInfo)
         this.queryOrderDetail()
         this.queryOrderDetail()
     },
     },
     // 再次下单
     // 再次下单
     onOrderAgain: function (event) {
     onOrderAgain: function (event) {
-        console.log(this.data.orderInfo)
         let funcItem = this.data.orderInfo
         let funcItem = this.data.orderInfo
         funcItem.shopAppId = wx.getStorageSync('shopInfoBuffer').appId
         funcItem.shopAppId = wx.getStorageSync('shopInfoBuffer').appId
 
 
@@ -116,11 +117,11 @@ Page({
     },
     },
     // 去评价
     // 去评价
     onOrderEvaluate: function (event) {
     onOrderEvaluate: function (event) {
-        let item = JSON.stringify(this.data.orderInfo)
         wx.navigateTo({
         wx.navigateTo({
-            url: `/pages/pay/order-comment/order-comment?orderItem=${item}&pageFrom=orderDetail`,
+            url: '/pages/pay/order-comment/order-comment?pageFrom=orderList&id=' + this.data.orderInfo.id
         })
         })
     },
     },
+    
     // 删除订单&取消订单
     // 删除订单&取消订单
     // type :1删除0取消
     // type :1删除0取消
     onDelOrCancelOrder: function (event) {
     onDelOrCancelOrder: function (event) {
@@ -151,20 +152,9 @@ Page({
                             iconType: 'success',
                             iconType: 'success',
                             title: type == 1 ? '订单删除成功' : '订单取消成功',
                             title: type == 1 ? '订单删除成功' : '订单取消成功',
                             ending: function () {
                             ending: function () {
-                                console.log('ending')
-                                if (type == 1) {
-                                    // 删除操作
                                 wx.navigateBack({
                                 wx.navigateBack({
                                     delta: 1
                                     delta: 1
                                 })
                                 })
-                                } else {
-                                    // 取消操作
-                                    let state = `orderInfo.state`
-                                    this.setData({
-                                        isDoing: false,
-                                        [state]: -1
-                                    })
-                                }
                             }
                             }
                         })
                         })
                         this.setData({
                         this.setData({
@@ -177,6 +167,7 @@ Page({
     },
     },
     // 使用须知
     // 使用须知
     handleNotice() {
     handleNotice() {
+        console.log(this.data.orderInfo.particulars)
         let showNotice = true
         let showNotice = true
         this.setData({
         this.setData({
             showNotice
             showNotice
@@ -233,7 +224,7 @@ Page({
             },
             },
             success: (response) => {
             success: (response) => {
                 let funcResponse = response.data
                 let funcResponse = response.data
-                console.log('funcResponse.paymentTime', funcResponse.paymentTime)
+                console.log('queryOrderDetail', this.data.orderInfo.id)
 
 
                 let funcOrderInfo = {
                 let funcOrderInfo = {
                     'id': this.data.orderInfo.id,
                     'id': this.data.orderInfo.id,
@@ -279,7 +270,7 @@ Page({
                 let funcCommodity = funcResponse.smOrderDetails
                 let funcCommodity = funcResponse.smOrderDetails
                 for (let i = 0, l = funcCommodity.length; i < l; i++) {
                 for (let i = 0, l = funcCommodity.length; i < l; i++) {
                     let funcCommodityItem = {
                     let funcCommodityItem = {
-                        'cover': funcCommodity[i].imgUrl,
+                        'cover': funcCommodity[i].imgUrl ? funcCommodity[i].imgUrl : this.data.resourcesBase + 'commodity/menu/commodity-item.png',
                         'name': funcCommodity[i].name, // 名称
                         'name': funcCommodity[i].name, // 名称
                         'quantity': funcCommodity[i].number, // 数量
                         'quantity': funcCommodity[i].number, // 数量
                         'amount': funcCommodity[i].unitPrice, // 总价
                         'amount': funcCommodity[i].unitPrice, // 总价
@@ -316,6 +307,8 @@ Page({
                 this.setData({
                 this.setData({
                     orderInfo: funcOrderInfo
                     orderInfo: funcOrderInfo
                 })
                 })
+                console.log('2222')
+                console.log(this.data.orderInfo)
 
 
                 // 判断是否自动展示二维码
                 // 判断是否自动展示二维码
                 // 订单列表 去使用 按钮
                 // 订单列表 去使用 按钮

pages/pay/order-detail/order-detail.wxml

@@ -216,7 +216,7 @@
     </view>
     </view>
 
 
     <view wx:if="{{orderInfo.commodityType === 5}}" class="buy-content-art-tip row align-c">
     <view wx:if="{{orderInfo.commodityType === 5}}" class="buy-content-art-tip row align-c">
-        <image src="{{imageBase + 'fail-glod.png'}}"></image>
+        <image src="{{imageBase + 'icon/warning-4.png'}}"></image>
         <text>请在下单3天内取餐，逾期失效</text>
         <text>请在下单3天内取餐，逾期失效</text>
     </view>
     </view>
 
 

pages/pay/order-detail/order-detail.wxss

@@ -213,7 +213,7 @@
 .commodity-item {
 .commodity-item {
     width: 606rpx;
     width: 606rpx;
     height: 184rpx;
     height: 184rpx;
-    border-bottom: 0.5px #e2e7ef solid;
+    border-bottom: 1px #e2e7ef solid;
 }
 }
 
 
 .commodity-item>image {
 .commodity-item>image {
@@ -273,7 +273,7 @@
 /* 订单提示 */
 /* 订单提示 */
 
 
 .tip {
 .tip {
-    margin: 74rpx 40rpx 70rpx 40rpx;
+    margin: 74rpx 40rpx 180rpx 40rpx;
 }
 }
 
 
 .tip-pay {
 .tip-pay {
@@ -467,7 +467,7 @@
     width: 100%;
     width: 100%;
     padding: 48rpx 32rpx 46rpx;
     padding: 48rpx 32rpx 46rpx;
     background: #F5F6F8;
     background: #F5F6F8;
-    border-bottom: 0.5px dashed #e2e7ef;
+    border-bottom: 1px dashed #e2e7ef;
 }
 }
 
 
 .ticket-left {
 .ticket-left {
@@ -740,7 +740,7 @@
 .goods-item {
 .goods-item {
     margin-bottom: 22rpx;
     margin-bottom: 22rpx;
     padding-bottom: 22rpx;
     padding-bottom: 22rpx;
-    border-bottom: 0.5px solid #e2e7ef;
+    border-bottom: 1px solid #e2e7ef;
 }
 }
 
 
 .goods-item:last-child {
 .goods-item:last-child {
@@ -843,7 +843,7 @@
     width: 100%;
     width: 100%;
     background: #FFFFFF;
     background: #FFFFFF;
     padding: 32rpx 20rpx;
     padding: 32rpx 20rpx;
-    border-top: 0.5px solid #e2e7ef;
+    border-top: 1px solid #e2e7ef;
 }
 }
 
 
 .delete-btn, .order-btn {
 .delete-btn, .order-btn {

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

@@ -26,6 +26,7 @@ Page({
         orderId: '',
         orderId: '',
         orderType: 1,                  // 1 - 年卡月卡，2 - 普通商品， 3 - 门票商品， 4 - 文创， 5 - 餐品， 6 - 活动， 7 - 观影
         orderType: 1,                  // 1 - 年卡月卡，2 - 普通商品， 3 - 门票商品， 4 - 文创， 5 - 餐品， 6 - 活动， 7 - 观影
                                         
                                         
+        cssShadow: '',
 
 
         formName: '',
         formName: '',
         formPhone: '',
         formPhone: '',
@@ -91,8 +92,6 @@ Page({
 
 
         stockList: [],
         stockList: [],
         winStockTip: false,
         winStockTip: false,
-        
-        isIphoneX: '', //判断是否为iphonex
     },
     },
 
 
     onLoad: function (options) {
     onLoad: function (options) {
@@ -118,7 +117,6 @@ Page({
     setView: function () {
     setView: function () {
         this.setData({
         this.setData({
             registerInfo: [JSON.parse(JSON.stringify(logicData.registerInfoItem))],
             registerInfo: [JSON.parse(JSON.stringify(logicData.registerInfoItem))],
-            isIphoneX: wx.getSystemInfoSync().model.indexOf("iPhone X")
         })
         })
 
 
         switch (logicData.option.type) {
         switch (logicData.option.type) {
@@ -466,23 +464,28 @@ Page({
                     buyContentCover: funcResponse.cover
                     buyContentCover: funcResponse.cover
                 })
                 })
 
 
+                console.log(funcDate)
+                console.log(this.data.quantityTipNumber, funcEntryId)
+
                 // 如果存在场次 id 则重新设置场次信息
                 // 如果存在场次 id 则重新设置场次信息
                 if (funcEntryId) {
                 if (funcEntryId) {
-                    let funcDate = ''
+                    let funcDateBegin = ''
                     let funcTimeBegin = ''
                     let funcTimeBegin = ''
                     let funcTimeEnd = ''
                     let funcTimeEnd = ''
 
 
                     for (let i = 0, l = funcTimetable.length; i < l; i++) {
                     for (let i = 0, l = funcTimetable.length; i < l; i++) {
                         if (funcEntryId === funcTimetable[i].id) {
                         if (funcEntryId === funcTimetable[i].id) {
-                            funcDate = App.modular.miment(funcTimetable[i].beginTime).format('MM月DD日')
+                            funcDateBegin = App.modular.miment(funcTimetable[i].beginTime).format('MM月DD日')
                             funcTimeBegin = App.modular.miment(funcTimetable[i].beginTime).format('hh:mm')
                             funcTimeBegin = App.modular.miment(funcTimetable[i].beginTime).format('hh:mm')
                             funcTimeEnd = App.modular.miment(funcTimetable[i].endTime).format('hh:mm')
                             funcTimeEnd = App.modular.miment(funcTimetable[i].endTime).format('hh:mm')
+
+                            this.setData({
+                                quantityTipNumber: funcDate[0][i].residue,
+                                buyContentTime: funcDateBegin + ' ' + funcTimeBegin + ' - ' + funcTimeEnd
+                            })
                             break
                             break
                         }
                         }
                     }
                     }
-                    this.setData({
-                        buyContentTime: funcDate + ' ' + funcTimeBegin + ' - ' + funcTimeEnd
-                    })
                 }
                 }
 
 
                 // 活动时间显示取范围实现，观影时间显示取选择场次时间
                 // 活动时间显示取范围实现，观影时间显示取选择场次时间
@@ -577,12 +580,14 @@ Page({
                         case '年卡':
                         case '年卡':
                             this.setData({
                             this.setData({
                                 buyContent: 'pay/order-input/card-1.png',
                                 buyContent: 'pay/order-input/card-1.png',
+                                cssShadow: 'box-shadow: 0 0 20rpx #f2dae0;'
                             })
                             })
                             break
                             break
 
 
                         case '月卡':
                         case '月卡':
                             this.setData({
                             this.setData({
                                 buyContent: 'pay/order-input/card-2.png',
                                 buyContent: 'pay/order-input/card-2.png',
+                                cssShadow: 'box-shadow: 0 0 20rpx #dae4f2;'
                             })
                             })
                             break
                             break
 
 
@@ -620,6 +625,7 @@ Page({
     },
     },
 
 
     onInputBlur: function(event) {
     onInputBlur: function(event) {
+        console.log(event)
         let funcType = event.target.dataset.type
         let funcType = event.target.dataset.type
         let funcIndex = event.target.dataset.index
         let funcIndex = event.target.dataset.index
         let funcValue = event.detail.value
         let funcValue = event.detail.value

pages/pay/order-input/order-input.json

 {
 {
-    "usingComponents": {},
-    "navigationStyle": "default",
-    "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "确认订单",
-    "navigationBarBackgroundColor": "#FFFFFF"
+    "usingComponents": {}
 }
 }
\ No newline at end of file

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

 <m-toast></m-toast>
 <m-toast></m-toast>
+<m-nav titleText="确认订单" styleIndex="{{1}}"></m-nav>
+
 <view class="container">
 <view class="container">
     <!-- winBuyContent -->
     <!-- winBuyContent -->
     <view class="buy-content" wx:if="{{winBuyContent}}">
     <view class="buy-content" wx:if="{{winBuyContent}}">
         <!-- 年卡月卡 -->
         <!-- 年卡月卡 -->
-        <view class="buy-content-pass" wx:if="{{orderType === 1}}">
+        <view class="buy-content-pass" wx:if="{{orderType === 1}}" style="{{cssShadow}}">
             <image src="{{resourcesBase + buyContent}}"></image>
             <image src="{{resourcesBase + buyContent}}"></image>
-            <view class="buy-content-pass-content col con-b">
+            <view class="buy-content-pass-content column con-b">
                 <view class="col">
                 <view class="col">
                     <text class="pass-content-title">{{shoppingCartList[0].name}}</text>
                     <text class="pass-content-title">{{shoppingCartList[0].name}}</text>
                     <view class="row">
                     <view class="row">
@@ -15,11 +17,11 @@
                     </view>
                     </view>
                 </view>
                 </view>
                 <view class="col">
                 <view class="col">
-                    <view class="row align-c">
+                    <view class="row ac">
                         <text class="pass-content-tip">{{'使用次数　'}}</text>
                         <text class="pass-content-tip">{{'使用次数　'}}</text>
                         <text class="pass-content-tip">{{'不限'}}</text>
                         <text class="pass-content-tip">{{'不限'}}</text>
                     </view>
                     </view>
-                    <view class="row align-c">
+                    <view class="row ac">
                         <text class="pass-content-tip">{{'有效期　'}}</text>
                         <text class="pass-content-tip">{{'有效期　'}}</text>
                         <text class="pass-content-tip">{{shoppingCartList[0].dateValid + ' - ' + shoppingCartList[0].dateInvalid}}</text>
                         <text class="pass-content-tip">{{shoppingCartList[0].dateValid + ' - ' + shoppingCartList[0].dateInvalid}}</text>
                     </view>
                     </view>
@@ -28,20 +30,20 @@
         </view>
         </view>
 
 
         <!-- 普通商品 -->
         <!-- 普通商品 -->
-        <view class="buy-content-service row align-c" wx:if="{{orderType === 2}}">
-            <view class="row con-c align-c">
+        <view class="buy-content-service row ac" wx:if="{{orderType === 2}}">
+            <view class="row cc ac">
                 <image src="{{resourcesBase + shopInfo.cover}}"></image>
                 <image src="{{resourcesBase + shopInfo.cover}}"></image>
             </view>
             </view>
-            <view class="buy-content-service-info col con-b">
-                <text class="row align-c">{{buyContentTitle}}</text>
+            <view class="buy-content-service-info column con-b">
+                <text class="row ac">{{buyContentTitle}}</text>
                 <text>{{'¥' + buyContentAmount}}</text>
                 <text>{{'¥' + buyContentAmount}}</text>
             </view>
             </view>
         </view>
         </view>
 
 
         <!-- 次票 -->
         <!-- 次票 -->
-        <view class="buy-content-pass" wx:if="{{orderType === 3}}">
+        <view class="buy-content-pass" wx:if="{{orderType === 3}}" style="box-shadow: 0 0 20rpx #f2e0da;">
             <image src="{{resourcesBase + buyContent}}"></image>
             <image src="{{resourcesBase + buyContent}}"></image>
-            <view class="buy-content-pass-content col con-b">
+            <view class="buy-content-pass-content column con-b">
                 <view class="col">
                 <view class="col">
                     <text class="pass-content-title">{{shoppingCartList[0].name}}</text>
                     <text class="pass-content-title">{{shoppingCartList[0].name}}</text>
                     <view class="row">
                     <view class="row">
@@ -51,13 +53,13 @@
                     </view>
                     </view>
                 </view>
                 </view>
                 <view class="col">
                 <view class="col">
-                    <view class="row align-c">
+                    <view class="row ac">
                         <text class="pass-content-tip">{{'使用次数　'}}</text>
                         <text class="pass-content-tip">{{'使用次数　'}}</text>
-                        <text class="pass-content-tip-right">{{'1次'}}</text>
+                        <text class="pass-content-tip">{{'1次'}}</text>
                     </view>
                     </view>
-                    <view class="row align-c">
+                    <view class="row ac">
                         <text class="pass-content-tip">{{'有效期　'}}</text>
                         <text class="pass-content-tip">{{'有效期　'}}</text>
-                        <text class="pass-content-tip-right">{{shoppingCartList[0].dateValid + ' - ' + shoppingCartList[0].dateInvalid}}</text>
+                        <text class="pass-content-tip">{{shoppingCartList[0].dateValid + ' - ' + shoppingCartList[0].dateInvalid}}</text>
                     </view>
                     </view>
                 </view>
                 </view>
             </view>
             </view>
@@ -68,11 +70,11 @@
             <view class="buy-content-art-title">
             <view class="buy-content-art-title">
                 <text>取货门店</text>
                 <text>取货门店</text>
             </view>
             </view>
-            <view class="buy-content-art-item row align-c">
-                <view class="row con-c align-c">
+            <view class="buy-content-art-item row ac">
+                <view class="row cc ac">
                     <image src="{{resourcesBase + shopInfo.cover}}"></image>
                     <image src="{{resourcesBase + shopInfo.cover}}"></image>
                 </view>
                 </view>
-                <view class="buy-content-art-info col con-c">
+                <view class="buy-content-art-info column cc">
                     <text>{{buyContentTitle}}</text>
                     <text>{{buyContentTitle}}</text>
                     <text>{{buyContentTime}}</text>
                     <text>{{buyContentTime}}</text>
                 </view>
                 </view>
@@ -84,27 +86,27 @@
             <view class="buy-content-art-title">
             <view class="buy-content-art-title">
                 <text>取货门店</text>
                 <text>取货门店</text>
             </view>
             </view>
-            <view class="buy-content-art-item row align-c">
-                <view class="row con-c align-c">
+            <view class="buy-content-art-item row ac">
+                <view class="row cc ac">
                     <image src="{{resourcesBase + shopInfo.cover}}"></image>
                     <image src="{{resourcesBase + shopInfo.cover}}"></image>
                 </view>
                 </view>
-                <view class="buy-content-art-info col con-c">
+                <view class="buy-content-art-info column cc">
                     <text>{{buyContentTitle}}</text>
                     <text>{{buyContentTitle}}</text>
                     <text>{{buyContentTime}}</text>
                     <text>{{buyContentTime}}</text>
                 </view>
                 </view>
             </view>
             </view>
-            <view class="buy-content-art-tip row align-c">
-                <image src="{{imageBase + 'fail-glod.png'}}"></image>
+            <view class="buy-content-art-tip row ac">
+                <image src="{{imageBase + 'icon/warning-4.png'}}"></image>
                 <text>请在下单3天内取餐，逾期失效</text>
                 <text>请在下单3天内取餐，逾期失效</text>
             </view>
             </view>
         </view>
         </view>
 
 
         <!-- 活动 -->
         <!-- 活动 -->
-        <view class="buy-content-activity row align-c" wx:if="{{orderType === 6}}">
+        <view class="buy-content-activity row ac" wx:if="{{orderType === 6}}">
             <!-- <image src="{{resourcesBase + shopInfo.cover}}"></image> -->
             <!-- <image src="{{resourcesBase + shopInfo.cover}}"></image> -->
             <image src="{{buyContentCover}}"></image>
             <image src="{{buyContentCover}}"></image>
-            <view class="buy-content-activity-info col con-b">
-                <view class="title row align-c">
+            <view class="buy-content-activity-info column con-b">
+                <view class="title row ac">
                     <text>{{buyContentTitle}}</text>
                     <text>{{buyContentTitle}}</text>
                 </view>
                 </view>
                 <view class="time">
                 <view class="time">
@@ -117,10 +119,10 @@
         </view>
         </view>
 
 
         <!-- 电影 -->
         <!-- 电影 -->
-        <view class="buy-content-activity row align-c" wx:if="{{orderType === 7}}">
+        <view class="buy-content-activity row ac" wx:if="{{orderType === 7}}">
             <image src="{{shoppingCartList[0].cover}}"></image>
             <image src="{{shoppingCartList[0].cover}}"></image>
-            <view class="buy-content-activity-info col con-b">
-                <view class="title row align-c">
+            <view class="buy-content-activity-info column con-b">
+                <view class="title row ac">
                     <text>{{buyContentTitle}}</text>
                     <text>{{buyContentTitle}}</text>
                 </view>
                 </view>
                 <view class="time">
                 <view class="time">
@@ -140,15 +142,15 @@
         </view>
         </view>
         <view class="shopping-cart-list">
         <view class="shopping-cart-list">
             <block wx:for="{{shoppingCartList}}" wx:for-index="index" wx:for-item="item" wx:key="index">
             <block wx:for="{{shoppingCartList}}" wx:for-index="index" wx:for-item="item" wx:key="index">
-                <view wx:if="{{item.isActive}}" class="shopping-cart-item row con-b align-c" data-item="{{item}}">
+                <view wx:if="{{item.isActive}}" class="shopping-cart-item row con-b ac" data-item="{{item}}">
                     <view class="shopping-cart-item-cover">
                     <view class="shopping-cart-item-cover">
                         <image src="{{item.cover}}"></image>
                         <image src="{{item.cover}}"></image>
                     </view>
                     </view>
                     <view class="shopping-cart-item-name row">
                     <view class="shopping-cart-item-name row">
                         <text>{{item.name}}</text>
                         <text>{{item.name}}</text>
                     </view>
                     </view>
-                    <view class="shopping-cart-item-info col">
-                        <view class="row con-e">
+                    <view class="shopping-cart-item-info column">
+                        <view class="row ce ae">
                             <text>￥</text>
                             <text>￥</text>
                             <text>{{item.priceFinal}}</text>
                             <text>{{item.priceFinal}}</text>
                         </view>
                         </view>
@@ -156,7 +158,7 @@
                     </view>
                     </view>
                 </view>
                 </view>
             </block>
             </block>
-            <view class="shopping-cart-total row con-b align-c">
+            <view class="shopping-cart-total row con-b ac">
                 <text>总计</text>
                 <text>总计</text>
                 <view>
                 <view>
                     <text>￥</text>
                     <text>￥</text>
@@ -167,30 +169,30 @@
     </view>
     </view>
 
 
     <!-- winNotice -->
     <!-- winNotice -->
-    <view class="buy-notice row con-e align-c" wx:if="{{winNotice}}">
+    <view class="buy-notice row ce ac" wx:if="{{winNotice}}">
         <text bindtap="onNotice">{{noticeText}}</text>
         <text bindtap="onNotice">{{noticeText}}</text>
-        <image src="{{imageBase + 'more-g.png'}}" bindtap="onNotice"></image>
+        <image src="{{imageBase + 'icon/arrow-r-2.png'}}" bindtap="onNotice"></image>
     </view>
     </view>
 
 
     <!-- winEntry -->
     <!-- winEntry -->
-    <view class="entry" wx:if="{{winEntry && !winNoticeDetail}}">
+    <view class="entry" wx:if="{{winEntry}}">
         <view class="entry-title">
         <view class="entry-title">
             <text>选择报名时间与人数</text>
             <text>选择报名时间与人数</text>
         </view>
         </view>
         <view class="entry-label">
         <view class="entry-label">
             <text>报名时间</text>
             <text>报名时间</text>
         </view>
         </view>
-        <view class="entry-input row con-b align-c">
-            <picker class="row con-b align-c" mode="multiSelector" value="{{entryDate}}" range="{{entryDateList}}" bindcolumnchange="onEntryTimeChange" bindchange="onEntryTime">
+        <view class="entry-input row con-b ac">
+            <picker class="row con-b ac" mode="multiSelector" value="{{entryDate}}" range="{{entryDateList}}" bindcolumnchange="onEntryTimeChange" bindchange="onEntryTime">
                 <text>{{entrySelection}}</text>
                 <text>{{entrySelection}}</text>
             </picker>
             </picker>
-            <image class="input-icon" src="{{imageBase + 'more.png'}}"></image>
+            <image class="input-icon" src="{{imageBase + 'icon/arrow-r-1.png'}}"></image>
         </view>
         </view>
 
 
         <view class="entry-label">
         <view class="entry-label">
             <text>报名人数</text>
             <text>报名人数</text>
         </view>
         </view>
-        <view class="entry-input row con-b align-c">
+        <view class="entry-input row con-b ac">
             <button class="input-button input-cut" special="{{true}}" bind:tap="onQuantityCut">
             <button class="input-button input-cut" special="{{true}}" bind:tap="onQuantityCut">
                 <image wx:if="{{1 < quantity}}" class="input-icon" src="{{imageBase + 'icon/cut-1.png'}}"></image>
                 <image wx:if="{{1 < quantity}}" class="input-icon" src="{{imageBase + 'icon/cut-1.png'}}"></image>
                 <image wx:if="{{1 === quantity}}" class="input-icon" src="{{imageBase + 'icon/cut-2.png'}}"></image>
                 <image wx:if="{{1 === quantity}}" class="input-icon" src="{{imageBase + 'icon/cut-2.png'}}"></image>
@@ -201,11 +203,11 @@
                 <image wx:if="{{quantity === quantityMax || quantityMax === 0}}" class="input-icon" src="{{imageBase + 'icon/add-2.png'}}"></image>
                 <image wx:if="{{quantity === quantityMax || quantityMax === 0}}" class="input-icon" src="{{imageBase + 'icon/add-2.png'}}"></image>
             </button>
             </button>
         </view>
         </view>
-        <view class="quantity-other row con-b align-c">
+        <view class="quantity-other row con-b ac">
             <view class="quantity-error">
             <view class="quantity-error">
                 <text>{{quantityError}}</text>
                 <text>{{quantityError}}</text>
             </view>
             </view>
-            <view class="quantity-tip row align-c">
+            <view class="quantity-tip row ac">
                 <text>{{quantityTipText + '：'}}</text>
                 <text>{{quantityTipText + '：'}}</text>
                 <text>{{quantityTipNumber}}</text>
                 <text>{{quantityTipNumber}}</text>
             </view>
             </view>
@@ -213,11 +215,11 @@
     </view>
     </view>
 
 
     <!-- winQuantity -->
     <!-- winQuantity -->
-    <view class="quantity col" wx:if="{{winQuantity && !winNoticeDetail}}">
+    <view class="quantity column" wx:if="{{winQuantity}}">
         <view class="quantity-title">
         <view class="quantity-title">
             <text>{{quantityTitle}}</text>
             <text>{{quantityTitle}}</text>
         </view>
         </view>
-        <view class="quantity-input row con-b align-c">
+        <view class="quantity-input row con-b ac">
             <button class="input-button input-cut" special="{{true}}" bind:tap="onQuantityCut">
             <button class="input-button input-cut" special="{{true}}" bind:tap="onQuantityCut">
                 <image wx:if="{{1 < quantity}}" class="input-icon" src="{{imageBase + 'icon/cut-1.png'}}"></image>
                 <image wx:if="{{1 < quantity}}" class="input-icon" src="{{imageBase + 'icon/cut-1.png'}}"></image>
                 <image wx:if="{{1 === quantity}}" class="input-icon" src="{{imageBase + 'icon/cut-2.png'}}"></image>
                 <image wx:if="{{1 === quantity}}" class="input-icon" src="{{imageBase + 'icon/cut-2.png'}}"></image>
@@ -228,11 +230,11 @@
                 <image wx:if="{{quantity === quantityMax || quantityMax === 0}}" class="input-icon" src="{{imageBase + 'icon/add-2.png'}}"></image>
                 <image wx:if="{{quantity === quantityMax || quantityMax === 0}}" class="input-icon" src="{{imageBase + 'icon/add-2.png'}}"></image>
             </button>
             </button>
         </view>
         </view>
-        <view class="quantity-other row con-b align-c">
+        <view class="quantity-other row con-b ac">
             <view class="quantity-error">
             <view class="quantity-error">
                 <text>{{quantityError}}</text>
                 <text>{{quantityError}}</text>
             </view>
             </view>
-            <view class="quantity-tip row align-c">
+            <view class="quantity-tip row ac">
                 <text>{{quantityTipText + '：'}}</text>
                 <text>{{quantityTipText + '：'}}</text>
                 <text>{{quantityTipNumber}}</text>
                 <text>{{quantityTipNumber}}</text>
             </view>
             </view>
@@ -240,35 +242,60 @@
     </view>
     </view>
 
 
     <!-- winContact -->
     <!-- winContact -->
-    <view class="contact" wx:if="{{winContact && !winNoticeDetail && !winStockTip}}">
-        <view class="contact-title col">
+    <view class="contact" wx:if="{{winContact && !winStockTip}}">
+        <view class="contact-title column">
             <text>{{contactTitle}}</text>
             <text>{{contactTitle}}</text>
             <text>仅用于接收订单确认短信</text>
             <text>仅用于接收订单确认短信</text>
         </view>
         </view>
-        <view class="contact-input col">
+        <view class="contact-input column">
             <text class="contact-input-mark">姓名</text>
             <text class="contact-input-mark">姓名</text>
-            <input placeholder="请填写姓名" value="{{registerInfo[0].name}}" data-type="name" data-index="{{0}}" bindblur="onInputBlur"></input>
+            <m-input
+                inputId="input"
+                className="input row ac"
+                maxlength="50"
+                placeholder="请填写姓名"
+                data-type="name"
+                data-index="{{0}}"
+                bindblur="onInputBlur"
+            ></m-input>
             <text>{{registerInfo[0].errorName}}</text>
             <text>{{registerInfo[0].errorName}}</text>
         </view>
         </view>
-        <view class="contact-input col">
+        <view class="contact-input column">
             <text>手机号</text>
             <text>手机号</text>
-            <input placeholder="请填写手机号" value="{{registerInfo[0].phone}}" maxlength="11" type="number" data-type="phone" data-index="{{0}}" bindblur="onInputBlur"></input>
+            <m-input
+                inputId="input"
+                className="input row ac"
+                maxlength="11"
+                type="number"
+                placeholder="请填写手机号"
+                data-type="phone"
+                data-index="{{0}}"
+                bindblur="onInputBlur"
+            ></m-input>
             <text>{{registerInfo[0].errorPhone}}</text>
             <text>{{registerInfo[0].errorPhone}}</text>
         </view>
         </view>
-        <view class="contact-input col">
+        <view class="contact-input column">
             <text>备注</text>
             <text>备注</text>
-            <input placeholder="请填写备注" value="{{registerInfo[0].remarks}}" maxlength="50" data-type="remarks" data-index="{{0}}" bindblur="onInputBlur"></input>
+            <m-input
+                inputId="input"
+                className="input row ac"
+                maxlength="50"
+                placeholder="请填写备注"
+                data-type="remarks"
+                data-index="{{0}}"
+                bindblur="onInputBlur"
+            ></m-input>
             <text>{{registerInfo[0].errorRemarks}}</text>
             <text>{{registerInfo[0].errorRemarks}}</text>
         </view>
         </view>
     </view>
     </view>
 
 
     <!-- winRegister -->
     <!-- winRegister -->
-    <view class="register" wx:if="{{winRegister && !winNoticeDetail && !winStockTip}}">
-        <view class="register-title col">
+    <view class="register" wx:if="{{winRegister && !winStockTip}}">
+        <view class="register-title column">
             <text>填写贵宾信息</text>
             <text>填写贵宾信息</text>
         </view>
         </view>
-        <view class="register-tip row align-c">
-            <image src="{{imageBase + 'fail-glod.png'}}"></image>
+        <view class="register-tip row ac">
+            <image src="{{imageBase + 'icon/warning-4.png'}}"></image>
             <text>凭月卡入园需出示身份证信息</text>
             <text>凭月卡入园需出示身份证信息</text>
         </view>
         </view>
 
 
@@ -276,19 +303,43 @@
             <view class="register-item-title">
             <view class="register-item-title">
                 <text>{{registerTitle + (index + 1)}}</text>
                 <text>{{registerTitle + (index + 1)}}</text>
             </view>
             </view>
-            <view class="contact-input col">
+            <view class="contact-input column">
                 <text class="contact-input-mark">姓名</text>
                 <text class="contact-input-mark">姓名</text>
-                <input placeholder="请填写姓名" value="{{item.name}}" data-type="name" data-index="{{index}}" bindblur="onInputBlur"></input>
+                <m-input
+                    inputId="input"
+                    className="input row ac"
+                    maxlength="50"
+                    placeholder="请填写姓名"
+                    data-type="name"
+                    data-index="{{index}}"
+                    bindblur="onInputBlur"
+                ></m-input>
                 <text>{{item.errorName}}</text>
                 <text>{{item.errorName}}</text>
             </view>
             </view>
-            <view class="contact-input col">
+            <view class="contact-input column">
                 <text>手机号</text>
                 <text>手机号</text>
-                <input placeholder="请填写手机号" value="{{item.phone}}" maxlength="11" type="number" data-type="phone" data-index="{{index}}" bindblur="onInputBlur"></input>
+                <m-input
+                    inputId="input"
+                    className="input row ac"
+                    maxlength="11"
+                    type="number"
+                    placeholder="请填写手机号"
+                    data-type="phone"
+                    data-index="{{index}}"
+                    bindblur="onInputBlur"
+                ></m-input>
                 <text>{{item.errorPhone}}</text>
                 <text>{{item.errorPhone}}</text>
             </view>
             </view>
-            <view class="contact-input col">
+            <view class="contact-input column">
                 <text>身份证号</text>
                 <text>身份证号</text>
-                <input placeholder="请填写身份证号" value="{{item.identity}}" data-type="identity" data-index="{{index}}" bindblur="onInputBlur"></input>
+                <m-input
+                    inputId="input"
+                    className="input row ac"
+                    placeholder="请填写身份证号"
+                    data-type="identity"
+                    data-index="{{index}}"
+                    bindblur="onInputBlur"
+                ></m-input>
                 <text>{{item.errorIdentity}}</text>
                 <text>{{item.errorIdentity}}</text>
             </view>
             </view>
         </block>
         </block>
@@ -296,31 +347,31 @@
 </view>
 </view>
 
 
 <!-- winActivityResult -->
 <!-- winActivityResult -->
-<view class="entry-complete row con-c align-c" wx:if="{{winActivityResult}}">
+<view class="entry-complete row cc ac" wx:if="{{winActivityResult}}">
     <view class="entry-complete-tip">
     <view class="entry-complete-tip">
         <image src="{{resourcesBase + 'play/complete-tip.png'}}" bind:tap="onEntryComplete"></image>
         <image src="{{resourcesBase + 'play/complete-tip.png'}}" bind:tap="onEntryComplete"></image>
     </view>
     </view>
 </view>
 </view>
 
 
 <!-- winButtonPay -->
 <!-- winButtonPay -->
-<cover-view class="pay" style="padding-bottom:{{isIphoneX >=0?36:0}}rpx;" wx:if="{{winButtonPay && !winNoticeDetail && !winStockTip && !winActivityResult}}">
-    <cover-view class="pay-tip row align-c">
-        <cover-image src="{{imageBase + 'fail-glod.png'}}"></cover-image>
-        <cover-view class="pay-tip-text row con-c align-c">付款后一经确认不得退款</cover-view>
-    </cover-view>
-    <cover-view class="pay-operation row con-b align-c">
-        <cover-view class="row align-c">
-            <cover-view class="pay-operation-amount-symbol">￥</cover-view>
-            <cover-view class="pay-operation-amount">{{payAmount}}</cover-view>
-        </cover-view>
-        <cover-view class="pay-operation-confirm row con-c align-c" bindtap="onPaySubmit">立即支付</cover-view>
-    </cover-view>
-</cover-view>
+<view class="pay" wx:if="{{winButtonPay && !winStockTip && !winActivityResult}}">
+    <view class="pay-tip row ac">
+        <image src="{{imageBase + 'icon/warning-4.png'}}"></image>
+        <view class="pay-tip-text row cc ac">付款后一经确认不得退款</view>
+    </view>
+    <view class="pay-operation row con-b ac">
+        <view class="row ac">
+            <view class="pay-operation-amount-symbol">￥</view>
+            <view class="pay-operation-amount">{{payAmount}}</view>
+        </view>
+        <view class="pay-operation-confirm row cc ac" bindtap="onPaySubmit">立即支付</view>
+    </view>
+</view>
 
 
 <!-- winButtonAppointment -->
 <!-- winButtonAppointment -->
-<cover-view class="appointment row con-c align-c" wx:if="{{winButtonAppointment && !winNoticeDetail && !winActivityResult}}">
-    <cover-view class="appointment-confirm row con-c align-c" bindtap="onPaySubmit">确认预约</cover-view>
-</cover-view>
+<view class="appointment row cc ac" wx:if="{{winButtonAppointment && !winActivityResult}}">
+    <view class="appointment-confirm row cc ac" bindtap="onPaySubmit">确认预约</view>
+</view>
 
 
 <!-- 购买须知详情 -->
 <!-- 购买须知详情 -->
 <view class="notice-detail" wx:if="{{winNoticeDetail}}" bindtap="onNoticeClose">
 <view class="notice-detail" wx:if="{{winNoticeDetail}}" bindtap="onNoticeClose">
@@ -335,21 +386,21 @@
 </view>
 </view>
 
 
 <!-- 库存不足提示 -->
 <!-- 库存不足提示 -->
-<view class="stock-mask row con-c align-c" wx:if="{{winStockTip}}">
-    <view class="stock col con-c align-c">
-        <view class="stock-tip row con-c align-c">
+<view class="stock-mask row cc ac" wx:if="{{winStockTip}}">
+    <view class="stock column cc ac">
+        <view class="stock-tip row cc ac">
             <text>{{'抱歉，您本单商品有' + stockList.length + '件库存不足'}}</text>
             <text>{{'抱歉，您本单商品有' + stockList.length + '件库存不足'}}</text>
         </view>
         </view>
-        <view class="stock-info col align-c">
+        <view class="stock-info column ac">
             <block wx:for="{{stockList}}" wx:for-index="index" wx:for-item="item" wx:key="index">
             <block wx:for="{{stockList}}" wx:for-index="index" wx:for-item="item" wx:key="index">
-                <view class="stock-item row align-c">
+                <view class="stock-item row ac">
                     <image src="{{item.cover}}"></image>
                     <image src="{{item.cover}}"></image>
                     <text>{{item.name}}</text>
                     <text>{{item.name}}</text>
                 </view>
                 </view>
             </block>
             </block>
         </view>
         </view>
-        <view class="stock-close row con-c align-c" bindtap="onStockTipClose">
-            <button class="row con-c align-c">返回购物车</button>
+        <view class="stock-close row cc ac" bindtap="onStockTipClose">
+            <button class="row cc ac">返回购物车</button>
         </view>
         </view>
     </view>
     </view>
 </view>
 </view>
\ No newline at end of file

pages/pay/order-input/order-input.wxss

 .notice-detail {
 .notice-detail {
-    z-index: 1700;
+    z-index: 7;
     position: fixed;
     position: fixed;
     left: 0;
     left: 0;
     bottom: 0;
     bottom: 0;
@@ -15,29 +15,28 @@
     bottom: -950rpx;
     bottom: -950rpx;
     width: 750rpx;
     width: 750rpx;
     height: 70%;
     height: 70%;
-    padding: 130rpx 40rpx 50rpx 40rpx;
-    border-radius: 24rpx 24rpx 0rpx 0rpx;
+    padding: 0 40rpx 50rpx 40rpx;
+    border-radius: 12px 12px 0rpx 0rpx;
     background: #FFFFFF;
     background: #FFFFFF;
 }
 }
 
 
 .notice-title {
 .notice-title {
-    position: absolute;
-    top: 50rpx;
     width: 670rpx;
     width: 670rpx;
-    height: 130rpx;
+    margin: 56rpx 0 0 0;
 }
 }
 
 
 .notice-title text {
 .notice-title text {
     height: 58rpx;
     height: 58rpx;
     font-size: 42rpx;
     font-size: 42rpx;
-    font-weight: 500;
+    font-weight: 800;
     line-height: 58rpx;
     line-height: 58rpx;
     color: #15191F;
     color: #15191F;
 }
 }
 
 
 .notice-rich {
 .notice-rich {
     width: 670rpx;
     width: 670rpx;
-    height: 100%;
+    max-height: 848rpx;
+    margin: 40rpx 0 0 0;
     overflow-y: scroll;
     overflow-y: scroll;
 }
 }
 
 
@@ -57,6 +56,11 @@
     height: 356rpx;
     height: 356rpx;
     border-radius: 4rpx;
     border-radius: 4rpx;
     background: #808080;
     background: #808080;
+    /* 
+    box-shadow: 0 0 20rpx #f2dae0;  粉色
+    box-shadow: 0 0 20rpx #dae4f2;  蓝色
+    box-shadow: 0 0 20rpx #f2e0da;  橘色
+    */
 }
 }
 
 
 .buy-content-pass image {
 .buy-content-pass image {
@@ -76,7 +80,7 @@
 .pass-content-title {
 .pass-content-title {
     height: 58rpx;
     height: 58rpx;
     font-size: 42rpx;
     font-size: 42rpx;
-    font-weight: 600;
+    font-weight: 500;
     line-height: 58rpx;
     line-height: 58rpx;
     color: #FFFFFF;
     color: #FFFFFF;
 }
 }
@@ -86,8 +90,8 @@
     height: 58rpx;
     height: 58rpx;
     margin-top: 8rpx;
     margin-top: 8rpx;
     font-size: 42rpx;
     font-size: 42rpx;
-    font-weight: 600;
-    line-height: 36rpx;
+    font-weight: 500;
+    line-height: 58rpx;
     color: #FFFFFF;
     color: #FFFFFF;
 }
 }
 
 
@@ -97,7 +101,7 @@
     margin-right: 4rpx;
     margin-right: 4rpx;
     font-size: 26rpx;
     font-size: 26rpx;
     font-weight: 600;
     font-weight: 600;
-    line-height: 36rpx;
+    line-height: 58rpx;
     color: #FFFFFF;
     color: #FFFFFF;
 }
 }
 
 
@@ -107,7 +111,7 @@
     margin-left: 4rpx;
     margin-left: 4rpx;
     font-size: 26rpx;
     font-size: 26rpx;
     font-weight: 600;
     font-weight: 600;
-    line-height: 36rpx;
+    line-height: 58rpx;
     color: #FFFFFF;
     color: #FFFFFF;
 }
 }
 
 
@@ -124,7 +128,7 @@
     height: 32rpx;
     height: 32rpx;
     margin-top: 8rpx;
     margin-top: 8rpx;
     font-size: 22rpx;
     font-size: 22rpx;
-    font-weight: 400;
+    font-weight: 800;
     line-height: 32rpx;
     line-height: 32rpx;
     color: #FFFFFF;
     color: #FFFFFF;
     opacity: .9;
     opacity: .9;
@@ -302,6 +306,7 @@
 .shopping-cart-list {
 .shopping-cart-list {
     width: 670rpx;
     width: 670rpx;
     margin-top: 40rpx;
     margin-top: 40rpx;
+    padding: 16rpx 0 0 0;
     border-radius: 4rpx;
     border-radius: 4rpx;
     background: #F5F6F8;
     background: #F5F6F8;
 }
 }
@@ -311,14 +316,14 @@
     height: 188rpx;
     height: 188rpx;
     margin: 0 32rpx;
     margin: 0 32rpx;
     padding: 24rpx 0;
     padding: 24rpx 0;
-    border-bottom: 0.5px #E2E7EF solid;
+    border-bottom: 1px #E2E7EF solid;
 }
 }
 
 
 .shopping-cart-item-cover image {
 .shopping-cart-item-cover image {
     display: block;
     display: block;
     width: 140rpx;
     width: 140rpx;
     height: 140rpx;
     height: 140rpx;
-    border-radius: 4rpx;
+    border-radius: 2px;
     background: #808080;
     background: #808080;
 }
 }
 
 
@@ -337,7 +342,7 @@
     height: 108rpx;
     height: 108rpx;
 }
 }
 
 
-.shopping-cart-item-info view text:nth-child(1) {
+.shopping-cart-item-info > view > text:nth-child(1) {
     height: 36rpx;
     height: 36rpx;
     margin-top: 4rpx;
     margin-top: 4rpx;
     margin-right: 2rpx;
     margin-right: 2rpx;
@@ -348,7 +353,7 @@
     color: #15191F;
     color: #15191F;
 }
 }
 
 
-.shopping-cart-item-info view text:nth-child(2) {
+.shopping-cart-item-info > view > text:nth-child(2) {
     height: 36rpx;
     height: 36rpx;
     margin-top: 4rpx;
     margin-top: 4rpx;
     text-align: right;
     text-align: right;
@@ -437,7 +442,7 @@
     height: 80rpx;
     height: 80rpx;
     margin-top: 16rpx;
     margin-top: 16rpx;
     border-radius: 4rpx;
     border-radius: 4rpx;
-    border: 0.5px solid #DBDFE5;
+    border: 1px solid #DBDFE5;
 }
 }
 
 
 .entry-input picker {
 .entry-input picker {
@@ -473,7 +478,7 @@
     height: 80rpx;
     height: 80rpx;
     margin-top: 40rpx;
     margin-top: 40rpx;
     border-radius: 4rpx;
     border-radius: 4rpx;
-    border: 0.5px solid #DBDFE5;
+    border: 1px solid #DBDFE5;
 }
 }
 
 
 .input-button {
 .input-button {
@@ -487,11 +492,11 @@
 }
 }
 
 
 .input-cut {
 .input-cut {
-    border-right: 0.5px #E9EBEF solid;
+    border-right: 1px #E9EBEF solid;
 }
 }
 
 
 .input-add {
 .input-add {
-    border-left: 0.5px #E9EBEF solid;
+    border-left: 1px #E9EBEF solid;
 }
 }
 
 
 .input-icon {
 .input-icon {
@@ -555,7 +560,7 @@
     color: #959DA9;
     color: #959DA9;
 }
 }
 
 
-.contact-input text:nth-child(1) {
+.contact-input > text:nth-child(1) {
     height: 42rpx;
     height: 42rpx;
     margin-top: 32rpx;
     margin-top: 32rpx;
     font-size: 30rpx;
     font-size: 30rpx;
@@ -564,13 +569,13 @@
     color: #1E2025;
     color: #1E2025;
 }
 }
 
 
-.contact-input input {
+.contact-input .input {
     width: 670rpx;
     width: 670rpx;
     height: 80rpx;
     height: 80rpx;
     margin: 16rpx 0 8rpx 0;
     margin: 16rpx 0 8rpx 0;
     padding: 0 24rpx;
     padding: 0 24rpx;
     border-radius: 4rpx;
     border-radius: 4rpx;
-    border: 0.5px solid #DBDFE5;
+    border: 1px solid #DBDFE5;
 
 
     font-size: 30rpx;
     font-size: 30rpx;
     font-weight: 400;
     font-weight: 400;
@@ -578,7 +583,7 @@
     color: #000000;
     color: #000000;
 }
 }
 
 
-.contact-input text:nth-child(3) {
+.contact-input > text:nth-child(3) {
     height: 32rpx;
     height: 32rpx;
     font-size: 22rpx;
     font-size: 22rpx;
     font-weight: 400;
     font-weight: 400;
@@ -632,7 +637,7 @@
 
 
 /* 立即支付 */
 /* 立即支付 */
 .pay {
 .pay {
-    z-index: 9;
+    z-index: 4;
     position: fixed;
     position: fixed;
     bottom: 0;
     bottom: 0;
     left: 0;
     left: 0;
@@ -648,8 +653,7 @@
     background: #F5EEDF;
     background: #F5EEDF;
 }
 }
 
 
-.pay-tip cover-image {
-    display: block;
+.pay-tip image {
     width: 28rpx;
     width: 28rpx;
     height: 28rpx;
     height: 28rpx;
     margin-right: 14rpx;
     margin-right: 14rpx;
@@ -699,14 +703,14 @@
 
 
 /* 确认预约 */
 /* 确认预约 */
 .appointment {
 .appointment {
-    z-index: 9;
+    z-index: 4;
     position: fixed;
     position: fixed;
     bottom: 0;
     bottom: 0;
     left: 0;
     left: 0;
     width: 100%;
     width: 100%;
     margin-top: 40rpx;
     margin-top: 40rpx;
     padding: 30rpx 0 68rpx 0;
     padding: 30rpx 0 68rpx 0;
-    border: 0.5px #E2E7EF solid;
+    border: 1px #E2E7EF solid;
     background: #FFFFFF;
     background: #FFFFFF;
 }
 }
 
 
@@ -721,209 +725,8 @@
     font-weight: 500;
     font-weight: 500;
     color: #FFFFFF;
     color: #FFFFFF;
     line-height: 96rpx;
     line-height: 96rpx;
-
-}
-
-
-
-
-
-
-
-
-
-
-
-.card-name, .card-price {
-    font-size: 42rpx;
-    font-weight: 500;
-    line-height: 58rpx;
-}
-
-.card-price {
-    margin-top: 8rpx;
-}
-
-.price-symbol {
-    font-size: 26rpx;
-}
-.card-times {
-    margin-top: 80rpx;
-}
-
-.card-date {
-    margin-top: 8rpx;
-}
-
-.card-left, .card-right {
-    margin-right: 16rpx;
-    font-size: 22rpx;
-    line-height: 32rpx;
-    z-index: 10;
-}
-
-.card-left {
-    font-weight: 500;
-}
-.card-bg, .card-logo {
-    position: absolute;
-    right: 0;
-    bottom: 0;
-}
-
-.card-bg {
-    width: 366rpx;
-    height: 356rpx;
-    z-index: 1;
-}
-
-.card-logo {
-    width: 308rpx;
-    height: 186rpx;
-    z-index: 2;
-}
-.once-card-bg {
-    opacity: .5;
-    width: 670rpx;
-    height: 356rpx;
-}
-.once-card-logo {
-    bottom: 58rpx;
-}
-
-/* spa */
-.spa-wrapper,.artFood-store-wrapper {
-    width: 670rpx;
-    height: 216rpx;
-    margin: 64rpx auto 0;
-    padding: 40rpx 32rpx;
-    background-color: #F5F6F8;
-    border-radius: 4rpx;
-}
-.spa-img, .artFood-store-img, .artFood-goods-img {
-    width: 140rpx;
-    height: 136rpx;
-}
-.spa-info, .artFood-store-info, .active-info-wrapper {
-    flex: 1;
-    padding-left: 32rpx;
-}
-.spa-title, .artFood-store-name {
-    color: #15191F;
-    font-size: 30rpx;
-    line-height: 42rpx;
-    font-weight: 600;
-}
-.spa-price {
-    color: #5DB5DD;
-    font-size: 30rpx;
 }
 }
 
 
-/* 文创 */
-.artFood-top-wrapper {
-    width: 670rpx;
-    margin: 64rpx auto 0;
-}
-.artFood-store-wrapper {
-    margin-top: 0;
-}
-.artFood-store-title,.artFood-goods-title {
-    height: 90rpx;
-    color: #15191F;
-    font-size: 34rpx;
-    font-weight: 600;
-}
-.artFood-store-time {
-    color: #656E7B;
-    font-size: 26rpx;
-}
-.artFood-bottom-wrapper {
-    width: 670rpx;
-    margin: 64rpx auto 0;
-}
-.artFood-goods-wrapper {
-    padding: 20rpx 32rpx 0;
-    background-color: #F5F6F8;
-    border-radius: 4rpx;
-}
-.artFood-goods-item {
-    padding: 20rpx 0 24rpx;
-    border-bottom: 0.5px solid #E2E7EF;
-}
-.artFood-goods-name {
-    flex: 1;
-    color: #15191F;
-    font-size: 26rpx;
-    font-weight: 600;
-    line-height: 40rpx;
-    padding: 20rpx 24rpx 0 32rpx;
-}
-.artFood-goods-data {
-    width: 120rpx;
-    height: 80rpx;
-    margin-top: 20rpx;
-    text-align: right;
-    font-size: 26rpx;
-}
-.artFood-goods-price {
-    color: #15191F;
-    font-weight: 600;
-    line-height: 40rpx;
-}
-.artFood-goods-num {
-    color: #959DA9;
-    line-height: 40rpx;
-}
-.artFood-price-symbol {
-    font-size: 22rpx;
-}
-.artFood-total-price-wrapper {
-    margin-top: 24rpx;
-    height: 60rpx;
-    font-size: 26rpx;
-}
-.artFood-total-text {
-    color: #959DA9;
-}
-.artFood-total-price {
-    color: #5DB5DD;
-}
-.artFood-tips-wrapper {
-    margin: 40rpx auto 0;
-}
-
-/* 活动观影 */
-.active-wrapper {
-    width: 670rpx;
-    height: 280rpx;
-    margin: 64rpx auto 0;
-    padding: 40rpx 32rpx;
-    background-color: #F5F6F8;
-    border-radius: 4rpx;
-}
-.active-img {
-    width: 150rpx;
-    height: 200rpx;
-}
-.active-info {
-    height: 158rpx;
-}
-.active-name {
-    color: #15191F;
-    font-size: 30rpx;
-    font-weight: 600;
-    line-height: 42rpx;
-}
-.active-date {
-    margin-top: 16rpx;
-    color: #656E7B;
-    font-size: 26rpx;
-    line-height: 36rpx;
-}
-.active-price {
-    color: #5DB5DD;
-    font-size: 30rpx;
-}
 /* 购买须知 */
 /* 购买须知 */
 .notice-wrapper {
 .notice-wrapper {
     width: 100%;
     width: 100%;
@@ -993,7 +796,7 @@
 .stock-tip {
 .stock-tip {
     width: 526rpx;
     width: 526rpx;
     padding-bottom: 58rpx;
     padding-bottom: 58rpx;
-    border-bottom: 0.5px #E2E7EF solid;
+    border-bottom: 1px #E2E7EF solid;
 }
 }
 
 
 .stock-tip text {
 .stock-tip text {
@@ -1048,7 +851,7 @@
 
 
 /* 预约完成 */
 /* 预约完成 */
 .entry-complete {
 .entry-complete {
-    z-index: 1900;
+    z-index: 7;
     position: fixed;
     position: fixed;
     top: 0;
     top: 0;
     left: 0;
     left: 0;

pages/play/activity-detail/activity-detail.js

@@ -11,7 +11,7 @@ Page({
 
 
         activeState: 0, //0 未开始 1进行中 2已结束
         activeState: 0, //0 未开始 1进行中 2已结束
         isSubmit: false,
         isSubmit: false,
-        stateText: '未开始',
+        stateText: '立即报名',
         // 接口参数
         // 接口参数
         id: '',
         id: '',
     },
     },
@@ -99,7 +99,7 @@ Page({
     },
     },
     // 活动报名
     // 活动报名
     onReport: function () {
     onReport: function () {
-        if (this.data.activeState == 1) {
+        if (this.data.activeState !== 2) {
             wx.navigateTo({
             wx.navigateTo({
                 url: '/pages/pay/order-input/order-input?type=6'
                 url: '/pages/pay/order-input/order-input?type=6'
             })
             })
@@ -121,17 +121,18 @@ Page({
     configActiveState(state) {
     configActiveState(state) {
         var text = this.data.stateText
         var text = this.data.stateText
         switch (state) {
         switch (state) {
-            case 0: text = '未开始'
+            case 0:
+            case 1:
+                text = '立即报名'
                 break;
                 break;
-            case 1: text = '立即报名'
-                break;
-            case 2: text = '报名已截止'
+            case 2:
+                text = '报名已截止'
                 break;
                 break;
         }
         }
         this.setData({
         this.setData({
             activeState: state,
             activeState: state,
             stateText: text,
             stateText: text,
-            isSubmit: state == 1 ? true : false,
+            isSubmit: state !== 2 ? true : false,
         })
         })
     },
     },
 
 

pages/play/activity-detail/activity-detail.wxss

@@ -96,7 +96,7 @@
     min-height: 200rpx;
     min-height: 200rpx;
     margin: 0 auto;
     margin: 0 auto;
     padding-top: 48rpx;
     padding-top: 48rpx;
-    border-top: 0.5px #E2E7EF solid;
+    border-top: 1px #E2E7EF solid;
     font-size: 30rpx;
     font-size: 30rpx;
     color: #15191F;
     color: #15191F;
     line-height: 50rpx;
     line-height: 50rpx;
@@ -110,7 +110,7 @@
     width: 750rpx;
     width: 750rpx;
     height: 160rpx;
     height: 160rpx;
     padding: 32rpx 40rpx;
     padding: 32rpx 40rpx;
-    border-top: 0.5px #E2E7EF solid;
+    border-top: 1px #E2E7EF solid;
     background: #ffffff;
     background: #ffffff;
 }
 }
 
 

pages/play/activity/activity.js

@@ -82,13 +82,8 @@ Page({
                     'priceSpecial': funcData[i].ownerPrice,                                     // 业主价
                     'priceSpecial': funcData[i].ownerPrice,                                     // 业主价
                     'priceSpecialText': App.modular.utils.formatAmount(funcData[i].ownerPrice), // 业主价文本格式
                     'priceSpecialText': App.modular.utils.formatAmount(funcData[i].ownerPrice), // 业主价文本格式
                     'priceType': 1,
                     'priceType': 1,
-                    'isCanEenroll': false,
                 }
                 }
 
 
-                // 判断活动是否已经开始，能否报名。
-                let funcActiveDateStart = new Date().getFullYear() + '年' + funcData[i].activeDate.match(/[\w月日]+/g)[0]
-                if (App.modular.miment(funcActiveDateStart).stamp() < App.modular.miment().stamp()) funcItem.isCanEenroll = true
-
                 funcList.push(funcItem)
                 funcList.push(funcItem)
             }
             }
             funcList = App.setPriceType(funcList)
             funcList = App.setPriceType(funcList)

pages/play/activity/activity.wxml

 <m-nav titleText="主题活动" scrollHeight="{{navScroll}}" styleIndex="{{1}}" bindnavChangeHeight="eventNavChangeHeight"></m-nav>
 <m-nav titleText="主题活动" scrollHeight="{{navScroll}}" styleIndex="{{1}}" bindnavChangeHeight="eventNavChangeHeight"></m-nav>
 <m-tab item="{{tabItem}}" isFixed="{{true}}" fixedTop="{{tabTop}}" bindtabChange="eventTabChange"></m-tab>
 <m-tab item="{{tabItem}}" isFixed="{{true}}" fixedTop="{{tabTop}}" bindtabChange="eventTabChange"></m-tab>
 
 
-<view class="container">
+<view class="container bg-gradient">
     <!-- 近期活动 -->
     <!-- 近期活动 -->
     <block wx:if="{{activity.length > 0}}">
     <block wx:if="{{activity.length > 0}}">
         <view class="list">
         <view class="list">
@@ -41,8 +41,7 @@
                                 <text>{{item.price == '0' ? '免费' : item.priceText}}</text>
                                 <text>{{item.price == '0' ? '免费' : item.priceText}}</text>
                             </view>
                             </view>
                             <view>
                             <view>
-                                <button wx:if="{{!isCanEenroll}}" class="row con-c align-c">未开始</button>
-                                <button wx:if="{{isCanEenroll}}" class="row con-c align-c" catchtap="onReport" data-item="{{item}}">报名</button>
+                                <button class="row con-c align-c" catchtap="onReport" data-item="{{item}}">报名</button>
                             </view>
                             </view>
                         </view>
                         </view>
                     </view>
                     </view>
@@ -66,6 +65,11 @@
                             <view class="row con-c align-c">
                             <view class="row con-c align-c">
                                 <image src="{{item.cover}}" mode="aspectFill"></image>
                                 <image src="{{item.cover}}" mode="aspectFill"></image>
                             </view>
                             </view>
+                            <view class="route-item-tags row align-c">
+                                <block wx:for="{{item.tags}}" wx:for-index="indexTags" wx:for-item="itemTags" wx:key="indexTags">
+                                    <text>{{'# ' + itemTags}}</text>
+                                </block>
+                            </view>
                             <text class="route-item-title">{{item.name}}</text>
                             <text class="route-item-title">{{item.name}}</text>
                             <text class="route-item-content">{{item.date}}</text>
                             <text class="route-item-content">{{item.date}}</text>
                         </view>
                         </view>

pages/play/activity/activity.wxss

@@ -8,7 +8,6 @@
 .container {
 .container {
     min-height: 100vh;
     min-height: 100vh;
     padding-bottom: 100rpx;
     padding-bottom: 100rpx;
-    background: linear-gradient(180deg, #FFFFFF 0%, #F3F4F6 6%, #F3F4F6 100%);
 }
 }
 
 
 /* 状态筛选菜单 */
 /* 状态筛选菜单 */
@@ -18,7 +17,7 @@
     left: 0;
     left: 0;
     width: 750rpx;
     width: 750rpx;
     padding: 0 40rpx;
     padding: 0 40rpx;
-    border-bottom: 0.5px #e2e7ef solid;
+    border-bottom: 1px #e2e7ef solid;
     overflow-x: scroll;
     overflow-x: scroll;
     flex-wrap: nowrap;
     flex-wrap: nowrap;
     background-color: #fff;
     background-color: #fff;
@@ -108,7 +107,7 @@
     width: 96rpx;
     width: 96rpx;
     height: 32rpx;
     height: 32rpx;
     border-radius: 4rpx;
     border-radius: 4rpx;
-    border: 0.5px solid #86c5e1;
+    border: 1px solid #86c5e1;
     background: rgba(134, 197, 225, 0.1);
     background: rgba(134, 197, 225, 0.1);
     text-align: center;
     text-align: center;
     font-size: 18rpx;
     font-size: 18rpx;
@@ -215,15 +214,17 @@
     padding: 0 40rpx;
     padding: 0 40rpx;
 }
 }
 
 
-.route-list-left, .route-list-right {
+.route-list-left,
+.route-list-right {
     width: 320rpx;
     width: 320rpx;
 }
 }
 
 
 .route-item {
 .route-item {
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;
-    max-width: 328rpx;
-    margin-top: 16rpx;
+    width: 320rpx;
+    height: 534rpx;
+    margin: 32rpx 0 0 0;
     border-radius: 4rpx;
     border-radius: 4rpx;
     overflow: hidden;
     overflow: hidden;
     background: #fff;
     background: #fff;
@@ -251,7 +252,7 @@
 }
 }
 
 
 .route-item-content {
 .route-item-content {
-    margin: 0 32rpx 32rpx 32rpx;
+    margin: 8rpx 32rpx 32rpx 32rpx;
     font-size: 22rpx;
     font-size: 22rpx;
     color: #959da9;
     color: #959da9;
 }
 }

pages/play/movie-detail/movie-detail.wxss

@@ -112,7 +112,7 @@ page {
     width: 750rpx;
     width: 750rpx;
     margin-top: 48rpx;
     margin-top: 48rpx;
     padding: 0 40rpx;
     padding: 0 40rpx;
-    border-bottom: 0.5px #3A3A40 solid;
+    border-bottom: 1px #3A3A40 solid;
     overflow: scroll;
     overflow: scroll;
     flex-wrap: nowrap;
     flex-wrap: nowrap;
 }
 }
@@ -148,7 +148,7 @@ page {
     height: 160rpx;
     height: 160rpx;
     margin-left: 40rpx;
     margin-left: 40rpx;
     padding-right: 40rpx;
     padding-right: 40rpx;
-    border-bottom: 0.5px solid #3A3A40;
+    border-bottom: 1px solid #3A3A40;
 }
 }
 .show-time-start {
 .show-time-start {
     width: 118rpx;
     width: 118rpx;

pages/play/movie/movie.wxss

@@ -124,7 +124,7 @@ page {
     font-size: 22rpx;
     font-size: 22rpx;
     text-align: center;
     text-align: center;
     line-height: 32rpx;
     line-height: 32rpx;
-    border: 0.5px solid #86C5E1;
+    border: 1px solid #86C5E1;
     border-radius: 4rpx;
     border-radius: 4rpx;
 }
 }
 .movie-free {
 .movie-free {

pages/play/service-detail/service-detail.wxml

@@ -39,7 +39,7 @@
         </view>
         </view>
         <!-- 开放时间信息 -->
         <!-- 开放时间信息 -->
         <view class="commodity-other {{option.id === '6' || option.id === '4' ? 'food-border' : ''}} row align-c">
         <view class="commodity-other {{option.id === '6' || option.id === '4' ? 'food-border' : ''}} row align-c">
-            <image src="./image/time.png"></image>
+            <image src="{{imageBase + 'icon/clock-2.png'}}"></image>
             <text>开放时间</text>
             <text>开放时间</text>
             <text>{{info.date}}</text>
             <text>{{info.date}}</text>
         </view>
         </view>
@@ -65,23 +65,22 @@
                         <view class="commodity-card-item-operation row con-b align-c">
                         <view class="commodity-card-item-operation row con-b align-c">
                             <!-- 活动价样式 -->
                             <!-- 活动价样式 -->
                             <view class="row align-c" wx:if="{{item.priceType === 1}}">
                             <view class="row align-c" wx:if="{{item.priceType === 1}}">
-                                <text class="detail-price-discount">活动价</text>
+                                <text class="discount-mark">活动价</text>
                                 <text class="price-symbol">{{item.priceDiscount == '0' ? '' : '￥'}}</text>
                                 <text class="price-symbol">{{item.priceDiscount == '0' ? '' : '￥'}}</text>
-                                <text>{{item.priceDiscount == '0' ? '免费' : item.priceDiscountText}}</text>
-                                <text>{{'￥' + item.priceText}}</text>
+                                <text class="price-valid">{{item.priceDiscount == '0' ? '免费' : item.priceDiscountText}}</text>
+                                <text class="price-invalid">{{'￥' + item.priceText}}</text>
                             </view>
                             </view>
                             <!-- 业主价样式 -->
                             <!-- 业主价样式 -->
                             <view class="row align-c" wx:if="{{item.priceType === 2}}">
                             <view class="row align-c" wx:if="{{item.priceType === 2}}">
-                                <text class="detail-price-special">业主价</text>
+                                <text class="owner-mark">业主价</text>
                                 <text class="price-symbol">{{item.priceSpecial == '0' ? '' : '￥'}}</text>
                                 <text class="price-symbol">{{item.priceSpecial == '0' ? '' : '￥'}}</text>
-                                <text>{{item.priceSpecial == '0' ? '免费' : item.priceSpecialText}}</text>
-                                <text>{{'￥' + item.priceText}}</text>
+                                <text class="price-valid">{{item.priceSpecial == '0' ? '免费' : item.priceSpecialText}}</text>
+                                <text class="price-invalid">{{'￥' + item.priceText}}</text>
                             </view>
                             </view>
                             <!-- 普通价样式 -->
                             <!-- 普通价样式 -->
                             <view class="row align-c" wx:if="{{item.priceType === 3}}">
                             <view class="row align-c" wx:if="{{item.priceType === 3}}">
-                                <text class="">业主价</text>
                                 <text class="price-symbol">{{item.price == '0' ? '' : '￥'}}</text>
                                 <text class="price-symbol">{{item.price == '0' ? '' : '￥'}}</text>
-                                <text>{{item.price == '0' ? '免费' : item.priceText}}</text>
+                                <text class="price-valid">{{item.price == '0' ? '免费' : item.priceText}}</text>
                             </view>
                             </view>
                             <view>
                             <view>
                                 <button class="row con-c align-c">报名</button>
                                 <button class="row con-c align-c">报名</button>
@@ -127,24 +126,23 @@
                             <view class="commodity-card-item-operation row con-b align-c">
                             <view class="commodity-card-item-operation row con-b align-c">
                                 <!-- 活动价样式 -->
                                 <!-- 活动价样式 -->
                                 <view class="row align-c" wx:if="{{item.priceType === 1}}">
                                 <view class="row align-c" wx:if="{{item.priceType === 1}}">
-                                    <text class="detail-price-discount">活动价</text>
+                                    <text class="discount-mark">活动价</text>
                                     <text class="price-symbol">￥</text>
                                     <text class="price-symbol">￥</text>
-                                    <text>{{item.priceDiscountText == '0' ? '免费' : item.priceDiscountText}}</text>
-                                    <text>{{'￥' + item.priceText}}</text>
+                                    <text class="price-valid">{{item.priceDiscountText == '0' ? '免费' : item.priceDiscountText}}</text>
+                                    <text class="price-invalid">{{'￥' + item.priceText}}</text>
                                 </view>
                                 </view>
 
 
                                 <!-- 业主价样式 -->
                                 <!-- 业主价样式 -->
                                 <view class="row align-c" wx:if="{{item.priceType === 2}}">
                                 <view class="row align-c" wx:if="{{item.priceType === 2}}">
-                                    <text class="detail-price-special">业主价</text>
+                                    <text class="owner-mark">业主价</text>
                                     <text class="price-symbol">￥</text>
                                     <text class="price-symbol">￥</text>
-                                    <text>{{item.priceSpecialText == '0' ? '免费' : item.priceSpecialText}}</text>
-                                    <text>{{'￥' + item.priceText}}</text>
+                                    <text class="price-valid">{{item.priceSpecialText == '0' ? '免费' : item.priceSpecialText}}</text>
+                                    <text class="price-invalid">{{'￥' + item.priceText}}</text>
                                 </view>
                                 </view>
                                 <!-- 普通价样式 -->
                                 <!-- 普通价样式 -->
                                 <view class="row align-c" wx:if="{{item.priceType === 3}}">
                                 <view class="row align-c" wx:if="{{item.priceType === 3}}">
-                                    <text class="">业主价</text>
                                     <text class="price-symbol">￥</text>
                                     <text class="price-symbol">￥</text>
-                                    <text>{{item.priceText == '0' ? '免费' : item.priceText}}</text>
+                                    <text class="price-valid">{{item.priceText == '0' ? '免费' : item.priceText}}</text>
                                 </view>
                                 </view>
                                 <view>
                                 <view>
                                     <button class="row con-c align-c" data-id="{{item.id}}" data-classid="{{item.classifyId}}" bindtap="onBuyCommodity">购买</button>
                                     <button class="row con-c align-c" data-id="{{item.id}}" data-classid="{{item.classifyId}}" bindtap="onBuyCommodity">购买</button>
@@ -302,7 +300,7 @@
         </view>
         </view>
         <!-- 开放时间信息 -->
         <!-- 开放时间信息 -->
         <view class="commodity-other movie-border row align-c">
         <view class="commodity-other movie-border row align-c">
-            <image src="./image/time.png"></image>
+            <image src="{{imageBase + 'icon/clock-2.png'}}"></image>
             <text>开放时间</text>
             <text>开放时间</text>
             <text>{{info.date}}</text>
             <text>{{info.date}}</text>
         </view>
         </view>
@@ -407,7 +405,7 @@
 
 
         <view class="evaluate-list col">
         <view class="evaluate-list col">
             <block wx:for="{{detailEvaluate}}" wx:for-index="index" wx:for-item="item" wx:key="index">
             <block wx:for="{{detailEvaluate}}" wx:for-index="index" wx:for-item="item" wx:key="index">
-                <view class="evaluate-item col" style="border-bottom: 0.5px solid #3A3A40">
+                <view class="evaluate-item col" style="border-bottom: 1px solid #3A3A40">
                     <view class="row">
                     <view class="row">
                         <image class="evaluate-item-avatar" src="{{item.userAvatar}}" mode="widthFix"></image>
                         <image class="evaluate-item-avatar" src="{{item.userAvatar}}" mode="widthFix"></image>
                         <view class="evaluate-item-info">
                         <view class="evaluate-item-info">

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

@@ -44,7 +44,7 @@
 }
 }
 
 
 .other-black {
 .other-black {
-    border-bottom: 0.5px #3a3a40 solid;
+    border-bottom: 1px #3a3a40 solid;
 }
 }
 
 
 .other-black view text:nth-child(3) {
 .other-black view text:nth-child(3) {
@@ -75,13 +75,13 @@
     width: 750rpx;
     width: 750rpx;
     height: 160rpx;
     height: 160rpx;
     padding: 32rpx 40rpx;
     padding: 32rpx 40rpx;
-    border-top: 0.5px #e2e7ef solid;
+    border-top: 1px #e2e7ef solid;
     background: #fff;
     background: #fff;
 }
 }
 
 
 .operation-black {
 .operation-black {
     background: #272734;
     background: #272734;
-    border-top: 0.5px #272734 solid;
+    border-top: 1px #272734 solid;
 }
 }
 
 
 .operation .button {
 .operation .button {
@@ -155,7 +155,7 @@
 .commodity-other {
 .commodity-other {
     margin: 0 40rpx;
     margin: 0 40rpx;
     padding: 50rpx 0;
     padding: 50rpx 0;
-    border-bottom: 0.5px #e2e7ef solid;
+    border-bottom: 1px #e2e7ef solid;
     font-size: 30rpx;
     font-size: 30rpx;
     font-weight: 400;
     font-weight: 400;
     line-height: 44rpx;
     line-height: 44rpx;
@@ -342,7 +342,7 @@
     width: 96rpx;
     width: 96rpx;
     height: 32rpx;
     height: 32rpx;
     border-radius: 4rpx;
     border-radius: 4rpx;
-    border: 0.5rpx solid #86c5e1;
+    border: 1px solid #86c5e1;
     background: #eaf0f5;
     background: #eaf0f5;
     text-align: center;
     text-align: center;
     font-size: 18rpx;
     font-size: 18rpx;
@@ -433,19 +433,6 @@
     padding: 0 20rpx;
     padding: 0 20rpx;
 }
 }
 
 
-.commodity-card-item-operation text:nth-child(1) {
-    width: 78rpx;
-    height: 32rpx;
-    margin-right: 12rpx;
-    background: linear-gradient(180deg, #3f4357 0%, #252532 100%);
-    border-radius: 4rpx;
-    text-align: center;
-    font-size: 18rpx;
-    font-weight: 500;
-    line-height: 32rpx;
-    color: #e8d0af;
-}
-
 .movie-card-item-operation text:nth-child(1) {
 .movie-card-item-operation text:nth-child(1) {
     width: 52px;
     width: 52px;
     font-size: 26rpx;
     font-size: 26rpx;
@@ -454,37 +441,6 @@
     line-height: 40rpx;
     line-height: 40rpx;
 }
 }
 
 
-.commodity-card-item-operation text:nth-child(1) {
-    width: 78rpx;
-    height: 32rpx;
-    margin-right: 12rpx;
-    background: linear-gradient(180deg, #3f4357 0%, #252532 100%);
-    border-radius: 4rpx;
-    text-align: center;
-    font-size: 18rpx;
-    font-weight: 500;
-    line-height: 32rpx;
-    color: #e8d0af;
-}
-
-.commodity-card-item-operation text:nth-child(3) {
-    margin-right: 16rpx;
-    text-align: center;
-    font-size: 30rpx;
-    font-weight: 800;
-    line-height: 40rpx;
-    color: #15191f;
-}
-
-.commodity-card-item-operation text:nth-child(4) {
-    text-align: center;
-    font-size: 22rpx;
-    font-weight: 400;
-    line-height: 32rpx;
-    color: #c2c7cf;
-    text-decoration: line-through;
-}
-
 .price-symbol {
 .price-symbol {
     margin-top: 8rpx;
     margin-top: 8rpx;
     color: #15191f;
     color: #15191f;
@@ -492,6 +448,12 @@
     font-weight: 600;
     font-weight: 600;
 }
 }
 
 
+.owner-mark,
+.discount-mark,
+.price-valid {
+    margin-right: 12rpx;
+}
+
 .commodity-card-item-operation button {
 .commodity-card-item-operation button {
     flex-grow: 1;
     flex-grow: 1;
     width: 132rpx;
     width: 132rpx;
@@ -590,7 +552,7 @@
     height: 64rpx;
     height: 64rpx;
     margin-top: 80rpx;
     margin-top: 80rpx;
     padding: 0 40rpx;
     padding: 0 40rpx;
-    border-bottom: 0.5px #e2e7ef solid;
+    border-bottom: 1px #e2e7ef solid;
     background: #FFFFFF;
     background: #FFFFFF;
 }
 }
 
 
@@ -689,7 +651,7 @@
     width: 670rpx;
     width: 670rpx;
     min-height: 204rpx;
     min-height: 204rpx;
     margin: 48rpx 40rpx 0 40rpx;
     margin: 48rpx 40rpx 0 40rpx;
-    border-bottom: 0.5px solid #e2e7ef;
+    border-bottom: 1px solid #e2e7ef;
 }
 }
 
 
 .evaluate-item:last-child {
 .evaluate-item:last-child {
@@ -811,7 +773,7 @@
     flex-direction: row;
     flex-direction: row;
     justify-content: flex-start;
     justify-content: flex-start;
     margin: 32rpx 0 48rpx 0;
     margin: 32rpx 0 48rpx 0;
-    border-bottom: 0.5px #e2e7ef solid;
+    border-bottom: 1px #e2e7ef solid;
 }
 }
 
 
 .evaluate-item-album:last-child {
 .evaluate-item-album:last-child {
@@ -869,20 +831,6 @@
     min-height: 100%;
     min-height: 100%;
 }
 }
 
 
-/* 价格样式 */
-.detail-price-discount {
-    width: 90rpx;
-    height: 36rpx;
-    margin-right: 16rpx;
-    border-radius: 4rpx;
-    background: #faedea;
-    text-align: center;
-    font-size: 18rpx;
-    font-weight: 500;
-    line-height: 32rpx;
-    color: #ef4e4e;
-}
-
 .detail-price-special {
 .detail-price-special {
     width: 90rpx;
     width: 90rpx;
     height: 36rpx;
     height: 36rpx;

pages/play/service-sell/service-sell.js

@@ -2,6 +2,9 @@ let App = getApp()
 
 
 Page({
 Page({
     data: {
     data: {
+        imageBase: App.globalData.appImageBase,
+        resourcesBase: App.globalData.appResourcesBase,
+        
         bannerIndex: 0,
         bannerIndex: 0,
         bannerStyle: 1,
         bannerStyle: 1,
         banner: [],
         banner: [],

pages/play/service-sell/service-sell.wxml

@@ -43,7 +43,7 @@
             </view>
             </view>
             <view class="time-address row con-b">
             <view class="time-address row con-b">
                 <text>{{serviceInfo.address}}</text>
                 <text>{{serviceInfo.address}}</text>
-                <image class="service-icon" src="/image/more.png"></image>
+                <image class="service-icon" src="imageBase + 'icon/arrow-r-1.png'"></image>
             </view>
             </view>
         </view>
         </view>
     </view>
     </view>

pages/play/service-sell/service-sell.wxss

@@ -35,7 +35,7 @@
     width: 670rpx;
     width: 670rpx;
     margin-top: 50rpx;
     margin-top: 50rpx;
     padding-bottom: 36rpx;
     padding-bottom: 36rpx;
-    border-bottom: 0.5px solid #e2e7ef;
+    border-bottom: 1px solid #e2e7ef;
 }
 }
 
 
 .service-name {
 .service-name {
@@ -83,7 +83,7 @@
     height: 196rpx;
     height: 196rpx;
     padding: 32rpx 40rpx 68rpx;
     padding: 32rpx 40rpx 68rpx;
     background-color: #fff;
     background-color: #fff;
-    border-top: 0.5px solid #e2e7ef;
+    border-top: 1px solid #e2e7ef;
 }
 }
 
 
 /* 价格样式 */
 /* 价格样式 */

pages/play/strategy-detail/strategy-detail.js

-const App = getApp()
-
+let App = getApp()
 Page({
 Page({
     data: {
     data: {
         appStatus: App.globalData.appStatus,
         appStatus: App.globalData.appStatus,
+        imageBase: App.globalData.appImageBase,
+        resourcesBase: App.globalData.appResourcesBase,
 
 
 
 
         banner: [],
         banner: [],

pages/play/strategy-detail/strategy-detail.json

 {
 {
-    "usingComponents": {
-        "parser": "../../component/parser.min/parser"
-    }
+    "usingComponents": {}
 }
 }
\ No newline at end of file

pages/play/strategy-detail/strategy-detail.wxml

@@ -39,7 +39,7 @@
                         <text>{{item.price}}</text>
                         <text>{{item.price}}</text>
                     </view>
                     </view>
                     <view class="relation-item-more row align-c">
                     <view class="relation-item-more row align-c">
-                        <image src="/image/more-g.png"></image>
+                        <image src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
                     </view>
                     </view>
                 </view>
                 </view>
             </block>
             </block>

pages/play/strategy-detail/strategy-detail.wxss

@@ -61,7 +61,7 @@ rich-text {
 .relation-title {
 .relation-title {
     margin: 0 40rpx 90rpx 40rpx;
     margin: 0 40rpx 90rpx 40rpx;
     padding-top: 64rpx;
     padding-top: 64rpx;
-    border-top: 0.5px #E2E7EF solid;
+    border-top: 1px #E2E7EF solid;
 }
 }
 .relation-title text {
 .relation-title text {
     width: 120rpx;
     width: 120rpx;

project.config.json

@@ -8,6 +8,7 @@
         "es6": true,
         "es6": true,
         "enhance": true,
         "enhance": true,
         "postcss": true,
         "postcss": true,
+        "preloadBackgroundData": false,
         "minified": true,
         "minified": true,
         "newFeature": true,
         "newFeature": true,
         "coverView": true,
         "coverView": true,
@@ -19,14 +20,22 @@
         "checkInvalidKey": true,
         "checkInvalidKey": true,
         "checkSiteMap": false,
         "checkSiteMap": false,
         "uploadWithSourceMap": true,
         "uploadWithSourceMap": true,
+        "compileHotReLoad": false,
+        "useMultiFrameRuntime": false,
+        "useApiHook": true,
         "babelSetting": {
         "babelSetting": {
             "ignore": [],
             "ignore": [],
             "disablePlugins": [],
             "disablePlugins": [],
             "outputPath": ""
             "outputPath": ""
-		}
+        },
+        "useIsolateContext": true,
+        "useCompilerModule": true,
+        "userConfirmedUseCompilerModuleSwitch": false,
+        "packNpmManually": false,
+        "packNpmRelationList": []
     },
     },
     "compileType": "miniprogram",
     "compileType": "miniprogram",
-	"libVersion": "2.10.0",
+    "libVersion": "2.11.0",
     "appid": "wx37a9b7a3d92029f2",
     "appid": "wx37a9b7a3d92029f2",
     "projectname": "%E4%B8%96%E8%8C%82%E5%B0%8F%E7%A8%8B%E5%BA%8F%E4%BA%8C%E6%9C%9F",
     "projectname": "%E4%B8%96%E8%8C%82%E5%B0%8F%E7%A8%8B%E5%BA%8F%E4%BA%8C%E6%9C%9F",
     "cloudfunctionTemplateRoot": "",
     "cloudfunctionTemplateRoot": "",
@@ -41,26 +50,21 @@
     "simulatorPluginLibVersion": {},
     "simulatorPluginLibVersion": {},
     "condition": {
     "condition": {
         "search": {
         "search": {
-			"current": -1,
             "list": []
             "list": []
         },
         },
         "conversation": {
         "conversation": {
-			"current": -1,
             "list": []
             "list": []
         },
         },
         "plugin": {
         "plugin": {
-			"current": -1,
             "list": []
             "list": []
         },
         },
         "game": {
         "game": {
             "list": []
             "list": []
         },
         },
         "gamePlugin": {
         "gamePlugin": {
-			"current": -1,
             "list": []
             "list": []
         },
         },
         "miniprogram": {
         "miniprogram": {
-			"current": -1,
             "list": [
             "list": [
                 {
                 {
                     "id": -1,
                     "id": -1,

utils/page-extend.js

+let funcPageExtend = function () {
+    let funcPage = Page
+
+    Page = function (funcOption) {
+        let App = getApp()
+        let funcData = {
+            'appStatus': App.globalData.appStatus,
+            'imageBase': App.globalData.appImageBase,
+            'resourcesBase': App.globalData.appResourcesBase,
+        }
+        funcOption = Object.assign({
+            data: funcData,
+
+            onShareAppMessage: function () {
+                return {
+                    title: '碧海银湖 | 理想生活',
+                    path: '/pages/home/home/home',
+                    imageUrl: App.globalData.appImageBase + 'share.png',
+                }
+            }
+        }, funcOption)
+        funcPage(funcOption)
+    }
+}
+
+export default funcPageExtend
\ No newline at end of file

utils/request/interceptor.js

@@ -48,11 +48,13 @@ let Output = {
         
         
         // 请求错误处理
         // 请求错误处理
         if (funcResponse.errMsg === 'request:fail ') {
         if (funcResponse.errMsg === 'request:fail ') {
+            console.log('request:fail - 1')
             return false
             return false
         }
         }
 
 
         // 服务器错误处理
         // 服务器错误处理
         if (funcResponse.statusCode === 504) {
         if (funcResponse.statusCode === 504) {
+            console.log('request:fail - 2')
             return false
             return false
         }
         }
 
 
@@ -74,6 +76,17 @@ let Output = {
                             }
                             }
                         }
                         }
                     break
                     break
+
+                case 500:
+                    return {
+                        success: false,
+                        response: {
+                            code: funcResponse.data.code,
+                            data: '',
+                            message: funcResponse.data.msg
+                            }
+                        }
+                    break
             }
             }
         }
         }
 
 

utils/request/option.js

@@ -4,7 +4,7 @@ const output = {
     
     
 
 
     // 正式环境
     // 正式环境
-    // baseUrl: 'https://xsslc.cndrealty.com/',
+    // baseUrl: 'https://smbhyh-web.meiqicloud.com/api/',
 }
 }
 
 
 export default output
 export default output
\ No newline at end of file

wxss/samcss-layout.wxss

@@ -61,5 +61,5 @@
 }
 }
 
 
 .tt {
 .tt {
-    border: 0.5px red solid;
+    border: 1px red solid;
 }
 }
\ No newline at end of file