Merge branch 'mall_dev_7.13.1' into mall_dev_7.14.0

src/pages/order/order.wxml

@@ -24,8 +24,8 @@
 		wx:key="*this">
 			<view class="order-new-no" bindtap="handelDetail" data-id="{{item.id}}">
 				<view class="order-new-no-lf">
-					订单编号：{{item.id}}
-					<view class="copy" data-no="{{item.id}}" catchtap="onTapCopy">复制</view>
+					订单编号：{{item.orderNo || item.id}}
+					<view class="copy" data-no="{{item.orderNo || item.id}}" catchtap="onTapCopy">复制</view>
 				</view>
 				<image src="/assets/imgs/arrow-right.png" mode="aspectFit"></image>
 			</view>

src/pages/orderDetail/orderDetail.wxml

@@ -167,8 +167,8 @@
 		<view class="order-number-info">
 			<view class="order-number-item">
 				<text class="order-number-label">订单编号</text>
-				<text class="order-number-desc">{{detail.id}}</text>
-				<view class="copy" bindtap="copy" data-content="{{detail.id}}">复制</view>
+				<text class="order-number-desc">{{detail.orderNo || detail.id}}</text>
+				<view class="copy" bindtap="copy" data-content="{{detail.orderNo || detail.id}}">复制</view>
 			</view>
 			<view class="order-time">
 				<text class="order-number-label">创建时间</text>

src/project.config.json

@@ -7,7 +7,6 @@
 		"urlCheck": false,
 		"es6": true,
 		"postcss": true,
-		"preloadBackgroundData": false,
 		"minified": true,
 		"newFeature": true,
 		"coverView": true,
@@ -22,8 +21,9 @@
 			"disablePlugins": [],
 			"outputPath": ""
 		},
-		"useCompilerModule": false,
-		"userConfirmedUseCompilerModuleSwitch": false
+		"useCompilerModule": true,
+		"userConfirmedUseCompilerModuleSwitch": false,
+		"preloadBackgroundData": false
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.11.0",

src/subPackage/page/pages/selfPickUpOrderInfo/selfPickUpOrderInfo.wxml

@@ -71,8 +71,8 @@
 <!-- 订单其他信息 -->
 <view class="order-time">
   <view class="order-items">
-    订单编号：{{orderInfo.id}}
-    <view class="copy" bindtap="copy" data-content="{{orderInfo.id}}">复制</view>
+    订单编号：{{orderInfo.orderNo || orderInfo.id}}
+    <view class="copy" bindtap="copy" data-content="{{orderInfo.orderNo || orderInfo.id}}">复制</view>
   </view>
   <view class="order-items">下单时间：{{orderInfo.createTime}}</view>
   <view class="order-items">下单备注：{{orderInfo.buyerRemark}}</view>