Merge branch 'master' of repo.ufutx.net:ufutx.love.mp.v2

src/components/cu-custom.wpy

@@ -25,7 +25,7 @@
     </view>
     <view :class="{'~show':modalName=='Modal'}" class="~cu-modal ">
         <view class="cu-dialog">
-            <view class="cu-bar bg-white justify-end">
+            <view class="~cu-bar ~bg-white justify-end">
                 <view class="~content">提示</view>
                 <view class="action" bindtap="hideModal">
                     <text class="cuIcon-close text-red"></text>

src/pages/users/myOrderList.wpy

@@ -1,10 +1,10 @@
 <template>
   <view class="myOrderList">
     <view style="background:#f8f8f8;height:{{windowHeight}}px;">
-        <cuCustom  isCustom="{{true}}">
-            <view slot="backText">返回</view>
-            <view slot="content">我的订单</view>
-        </cuCustom>
+<!--        <cuCustom  :bgColor="bgOrder"  isCustom="{{true}}">-->
+<!--            <view slot="backText">返回</view>-->
+<!--            <view slot="content">我的订单</view>-->
+<!--        </cuCustom>-->
 
       <view style="height: {{currentTab != 0 ? 160 : 100}}rpx"></view>
 
@@ -72,7 +72,7 @@ wepy.page({
     floorstatus: false,
     vipTopHandle: -1,
     system: '',
-      bgVip: 'background: #333333;\ncolor: white'
+    bgOrder: 'background: #f8f8f8;\ncolor: white'
   },
 
   onShow () {
@@ -390,7 +390,6 @@ page{
 <config>
     {
     navigationBarTitleText: '我的订单',
-    navigationStyle: 'custom',
     enablePullDownRefresh: false,
     backgroundColorTop: '#f2f2f2',
     backgroundColorBottom: '#f2f2f2',