Merge branch 'main' into production

weixin-miniprogram/app.js

@@ -22,9 +22,14 @@ App({
   },
   globalData: {
     // debugMode: true, // 是否展示调试内容
-    baseUrl: true ? // Api 请求域名 不带最后的 /
-      "https://epp-prod.only4.work" :
-      "http://localhost",
+    /**
+     * FIXME 环境配置
+     *
+     * baseUrl
+     * - 线上环境：'https://epp.only4.work'
+     * - 开发环境：'http://localhost'
+     */
+    baseUrl: "https://epp-prod.only4.work", // Api 请求域名 不带最后的 /
     userInfo: null
   }
 })

weixin-miniprogram/pages/shop/myOrder.js

@@ -137,7 +137,7 @@ Page({
         filterList: filterList,
         filterActiveName: "全部",
         orderList: userOrder.orders.map(order => {
-          order.displayDate = order.orderDate.replace("T", " ")
+          order.displayDate = order.orderDate
           return order
         })
       })
@@ -153,7 +153,7 @@ Page({
       console.log("userOrder", userOrder)
       this.setData({
         orderList: userOrder.orders.map(order => {
-          order.displayDate = order.orderDate.replace("T", " ")
+          order.displayDate = order.orderDate
           return order
         })
       })

weixin-miniprogram/pages/shop/orderDetail.js

@@ -259,7 +259,7 @@ Page({
       this.setData({
         order: orderDetail.order,
         orderGoodList: orderGoodList,
-        orderTime: orderDetail.order.orderDate.replace("T", " "),
+        orderTime: orderDetail.order.orderDate,
         orderStatusCode: orderStatusCode,
         orderPrice: orderPrice,
       })

weixin-miniprogram/project.private.config.json

@@ -3,7 +3,7 @@
   "projectname": "weixin-miniprogram",
   "setting": {
     "compileHotReLoad": true,
-    "urlCheck": true,
+    "urlCheck": false,
     "bigPackageSizeSupport": true
   }
 }