Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp

components/m-goods-list/promotion.vue

@@ -65,6 +65,12 @@
 		methods: {
 			// 跳转到商品详情
 			navigateToDetailPage(item) {
+				if(this.type == 'kanJia'){
+					 uni.navigateTo({
+						url: `/pages/promotion/bargain/detail?id=${item.id}`,
+					});
+					return
+				}
 				uni.navigateTo({
 					url: `/pages/product/goods?id=${item.skuId}&goodsId=${item.goodsId}`,
 				});

manifest.json

@@ -2,8 +2,8 @@
     "name" : "lili商城",
     "appid" : "__UNI__EC9FD60",
     "description" : "",
-    "versionName" : "4.2.5",
-    "versionCode" : 4000250,
+    "versionName" : "4.2.7",
+    "versionCode" : 4000270,
     "transformPx" : false,
     "app-plus" : {
         "compatible" : {
@@ -84,7 +84,8 @@
                     "NSLocationAlwaysAndWhenInUseUsageDescription" : "位置信息将用于高德地图的效果展示",
                     "NSMicrophoneUsageDescription" : "用户上传视频时需使用音频信息"
                 },
-                "urltypes" : "lilishop"
+                "urltypes" : "lilishop",
+                "dSYMs" : false
             },
             /* ios打包配置 */
             "sdkConfigs" : {

pages/order/myOrder.vue

@@ -331,7 +331,7 @@ export default {
         this.initData(0);
       }
     }
-    // this.loadData(this.status);
+    this.loadData(this.status);
   },
 
   onLoad(options) {