Merge branch 'dev' of gitee.com:fengyuze178/xdd-uniapp-new into dev

pages.json

@@ -22,12 +22,6 @@
         "navigationBarTitleText": "登录"
       }
     },
-    {
-      "path": "pages/user/RetrievePassword/index",
-      "style": {
-        "navigationBarTitleText": "重置密码"
-      }
-    },
     {
       "path": "pages/home/index",
       "style": {
@@ -94,12 +88,6 @@
         "navigationBarTitleText": "搜索"
       }
     },
-    {
-      "path": "pages/NotDefined/index",
-      "style": {
-        "navigationBarTitleText": "404"
-      }
-    },
     {
       "path": "pages/cloud/haveFun",
       "style": {
@@ -140,18 +128,6 @@
         "navigationBarTitleText": "商品评价"
       }
     },
-    {
-      "path": "pages/shop/GoodsPromotion/index",
-      "style": {
-        "navigationBarTitleText": "促销商品"
-      }
-    },
-    {
-      "path": "pages/shop/HotNewGoods/index",
-      "style": {
-        "navigationBarTitleText": "热门商品"
-      }
-    },
     {
       "path": "pages/shop/GoodsCon/index",
       "style": {
@@ -185,43 +161,12 @@
         "navigationBarTitleText": "收货地址"
       }
     },
-    {
-      "path": "pages/user/promotion/Poster/index",
-      "style": {
-        "navigationBarTitleText": "推广名片"
-      }
-    },
-    {
-      "path": "pages/user/signIn/Sign/index",
-      "style": {
-        "navigationBarTitleText": "签到"
-      }
-    },
-    {
-      "path": "pages/user/signIn/SignRecord/index",
-      "style": {
-        "navigationBarTitleText": "签到记录"
-      }
-    },
     {
       "path": "pages/user/promotion/CashAudit/index",
       "style": {
         "navigationBarTitleText": "提现结果"
       }
     },
-    {
-      "path": "pages/user/promotion/PromoterOrder/index",
-      "style": {
-        "navigationBarTitleText": "分销详情"
-      }
-    },
-    {
-      "path": "pages/user/promotion/PromoterList/index",
-      "style": {
-        "navigationBarTitleText": "分销列表",
-        "navigationBarBackgroundColor": "#FFFFFF"
-      }
-    },
     {
       "path": "pages/user/promotion/UserPromotion/index",
       "style": {
@@ -255,12 +200,6 @@
         "navigationBarTitleText": "我的积分"
       }
     },
-    {
-      "path": "pages/user/UserVip/index",
-      "style": {
-        "navigationBarTitleText": "用户vip"
-      }
-    },
     {
       "path": "pages/user/promotion/UserCash/index",
       "style": {
@@ -343,13 +282,6 @@
         "navigationBarBackgroundColor": "#FFFFFF"
       }
     },
-    {
-      "path": "pages/user/MemberUpgradeIntro/MemberUpgradeIntro",
-      "style": {
-        "navigationBarTitleText": "升级说明",
-        "navigationBarBackgroundColor": "#FFFFFF"
-      }
-    },
     {
       "path": "pages/VideoPlayBackList/VideoPlayBackList",
       "style": {
@@ -364,31 +296,6 @@
         "navigationBarBackgroundColor": "#FFFFFF"
       }
     },
-    {
-      "path": "pages/user/UpgradeElectronicProtocol/UpgradeElectronicProtocol",
-      "style": {
-        "navigationBarTitleText": "升级",
-        "navigationBarBackgroundColor": "#FFFFFF"
-      }
-    },
-    {
-      "path": "pages/user/UpgradeProtocolDetail/UpgradeProtocolDetail",
-      "style": {
-        "navigationBarTitleText": "共享股东协议"
-      }
-    },
-    {
-      "path": "pages/LiveAndShortVideo/LiveAndShortVideo",
-      "style": {
-        "navigationBarTitleText": "直播/视频"
-      }
-    },
-    {
-      "path": "pages/LiveBroadcastList/LiveBroadcastList",
-      "style": {
-        "navigationBarTitleText": "直播列表"
-      }
-    },
     {
       "path": "pages/user/UserFavorite/UserFavorite",
       "style": {