Merge remote-tracking branch 'origin/dev' into dev

zxl

4 天以前 c9928dd4f6d25e2339ea1400f59ec58674a927a7

 pages.json

@@ -2,18 +2,20 @@
   "easycom": {
      "autoscan": true,
      "custom": {
         "^u-(.*)": "@/uview-components/uview-ui/components/u-$1/u-$1.vue", //uview,
         "^uni-(.*)": "@/uni_modules/uni-$1/components/uni-$1/uni-$1.vue" // uniapp组件
         "^u-(.*)": "@/components/uview-components/uview-ui/components/u-$1/u-$1.vue" //uview,
         // "^uni-(.*)": "@/uni_modules/uni-$1/components/uni-$1/uni-$1.vue" // uniapp组件
      }
   },
   "preloadRule": {
      "pages/tabbar/index/home": // 页面路径
      // 页面的预下载配置
      {
         "network": "all", // all(不限网络) wifi(仅wifi下预下载)
         "packages": ["uview-components"] // 预下载分包的 root 或 name。__APP__ 表示主包
      }
   },
   // "preloadRule": {
   //    "pages/tabbar/index/home": // 页面路径
   //    // 页面的预下载配置
   //    {
   //       "network": "all", // all(不限网络) wifi(仅wifi下预下载)
   //       "packages": [
   //          "components/uview-components"
   //       ] // 预下载分包的 root 或 name。__APP__ 表示主包
   //    }
   // },
   "pages": [
      // 第一个就是首页
      {
@@ -59,13 +61,16 @@
               "u-toast": "view"
            }
         }
      }, {
         "path": "pages/tabbar/category/category",
      },
      {
         // "path": "pages/tabbar/category/category",
         "path": "pages/commodity-square/commoditySquare",
		
         "style": {
            "navigationBarTitleText": "分类",
            "navigationStyle": "custom", // 隐藏系统导航栏
            "navigationBarTitleText": "商品广场",
            // "navigationStyle": "custom", // 隐藏系统导航栏
            "navigationBarTextStyle": "black",
            "disableScroll": true,
            // "disableScroll": true,
            "bounce": "none",
            "scrollIndicator": "none",
            "componentPlaceholder": {
@@ -171,7 +176,8 @@
               "u-back-top": "view"
            }
         }
      }, {
      },
      {
         "path": "pages/tabbar/user/my",
         "style": {
            "navigationBarTextStyle": "white",
@@ -184,12 +190,9 @@
            }
         }
      },

      {
         "path": "pages/tabbar/home/web-view",
         "style": {

         }
         "style": {}
      },
      {
         "path": "pages/tabbar/special/special",
@@ -217,13 +220,48 @@
         "path": "pages/goods-manager/goodsList/goodsList",
         "style": {
            "enablePullDownRefresh": true,
            "navigationBarTitleText": "商品列表"
            "navigationBarTitleText": "商品列表",
            "componentPlaceholder": {
               "u-icon": "view",
               "u-button": "view",
               "u-form": "view",
               "u-form-item": "view",
               "u-input": "view",
               "u-popup": "view",
               "u-search": "view"
            }
         }
      },
      {
         "path": "pages/goods-manager/addGoods/addGoods",
         "style": {
            "navigationBarTitleText": ""
            "enablePullDownRefresh": true,
            "navigationBarTitleText": "新增商品",
            "componentPlaceholder": {
               "u-icon": "view",
               "u-button": "view",
               "u-form": "view",
               "u-form-item": "view",
               "u-input": "view",
               "u-popup": "view",
               "u-search": "view",
               "u-upload": "view"
            }
         }
      },
      {
         "path": "pages/goods-manager/updateSkus/updateSkus",
         "style": {
            "enablePullDownRefresh": true,
            "navigationBarTitleText": "调整库存",
            "componentPlaceholder": {
               "u-icon": "view",
               "u-button": "view",
               "u-form": "view",
               "u-form-item": "view",
               "u-input": "view",
               "u-popup": "view"
            }
         }
      },
      {
@@ -239,31 +277,31 @@
               "u-popup": "view",
               "u-search": "view",
               "u-loading": "view",
               "u-navbar": "view"
            }

         }
      },

      {
         "path": "pages/customerManager/customerManager",
         "style": {
            "navigationBarTitleText": "客户管理",
            "componentPlaceholder": {
               "u-icon": "view",
               "u-button": "view",
               "u-form": "view",
               "u-form-item": "view",
               "u-input": "view",
               "u-popup": "view",
               "u-search": "view",
               "u-loading": "view",
               "u-checkbox": "view",
               "u-checkbox-group": "view",
               "u-navbar": "view"
               "u-navbar": "view",
               "u-loadmore":"view"
            }
         }
      },
      // {
      //    "path": "pages/customerManager/customerManager",
      //    "style": {
      //       "navigationBarTitleText": "客户管理",
      //       "componentPlaceholder": {
      //          "u-icon": "view",
      //          "u-button": "view",
      //          "u-form": "view",
      //          "u-form-item": "view",
      //          "u-input": "view",
      //          "u-popup": "view",
      //          "u-search": "view",
      //          "u-loading": "view",
      //          "u-checkbox": "view",
      //          "u-checkbox-group": "view",
      //          "u-navbar": "view",
      //          "u-loadmore":"view"
      //       }
      //    }
      // },
      {
         "path": "pages/userPermissions/addStoreMember",
         "style": {
@@ -280,26 +318,30 @@
               "u-loading": "view",
               "u-checkbox": "view",
               "u-checkbox-group": "view",
               "u-navbar": "view"
               "u-navbar": "view",
               "u-loadmore":"view",
               "u-switch": "view"
            }
         }
      }
   ],
   "subPackages": [{
         "root": "uview-components", // 必须与preloadRule中的名称完全一致
         "name": "uview-components",
         "pages": [{
            "path": "pages/empty-page/empty-page",
            "style": {
               "navigationBarTitleText": "",
               "disableScroll": true
            }
         }]
      },
   "subPackages": [
      // {
      //    "root": "components/uview-components", // 必须与preloadRule中的名称完全一致
      //    "name": "uview-components",
      //    "pages": [
      //       {
      //          "path": "pages/empty-page/empty-page",
      //          "style": {
      //             "navigationBarTitleText": "",
      //             "disableScroll": true
      //          }
      //       }
      //    ]
      // },
      {
         "root": "pages/mine",
         "pages": [

            {
               "path": "signIn",
               "style": {
@@ -308,7 +350,8 @@
                     "u-icon": "view"
                  }
               }
            }, {
            },
            {
               "path": "myTracks",
               "style": {
                  "navigationBarTitleText": "我的足迹",
@@ -323,7 +366,8 @@
                     "u-checkbox": "view"
                  }
               }
            }, {
            },
            {
               "path": "myCollect",
               "style": {
                  "navigationBarTitleText": "收藏",
@@ -429,43 +473,42 @@
               "path": "deposit/index",
               "style": {
                  "navigationStyle": "custom"

               }
            },
            {
               "path": "deposit/operation",
               "style": {
                  "navigationStyle": "custom"

               }
            },
            {
               "path": "deposit/recharge",
               "style": {
                  "navigationBarTitleText": "充值金额"

               }
            },
            {
               "path": "deposit/withdrawal",
               "style": {
                  "navigationBarTitleText": "提现金额"

               }
            },

            {
               "path": "deposit/info",
               "style": {
                  "navigationBarTitleText": "预存款详情"

               }
            },
            {
               "path": "address/address",
               "style": {
                  "enablePullDownRefresh": true,
                  "navigationBarTitleText": "地址管理"
                  "navigationBarTitleText": "地址管理",
                  "componentPlaceholder": {
                     "u-empty": "view",
                     "u-icon": "view",
                     "u-action-sheet": "view"
                  }
               }
            },
            {
@@ -507,7 +550,6 @@
                  "navigationBarTitleText": "功能介绍"
               }
            },

            {
               "path": "set/securityCenter/fingerLogin",
               "style": {
@@ -520,35 +562,26 @@
                  "navigationBarTitleText": "面容登录"
               }
            },


            {
               "path": "set/securityCenter/editPassword",
               "style": {
                  "navigationBarTitleText": "修改密码",
                  "app-plus": {

                  }
                  "app-plus": {}
               }
            },

            {
               "path": "set/securityCenter/bindMobile",
               "style": {
                  "navigationBarTitleText": "绑定手机号",
                  "app-plus": {

                  }
                  "app-plus": {}
               }
            },

            {
               "path": "im/list",
               "style": {
                  "navigationStyle": "custom", // 隐藏系统导航栏
                  "enablePullDownRefresh": true,
                  "app-plus": {}

               }
            },
            {
@@ -557,7 +590,6 @@
                  "navigationStyle": "custom", // 隐藏系统导航栏
                  "enablePullDownRefresh": true,
                  "app-plus": {}

               }
            },
            {
@@ -576,7 +608,6 @@
                  "navigationBarTitleText": "安全中心"
               }
            },

            {
               "path": "set/editionIntro",
               "style": {
@@ -606,12 +637,14 @@
                  "app-plus": {
                     "titleNView": {
                        "padding-right": "12",
                        "buttons": [{
                           "text": "保存",
                           "fontSize": "16",
                           "width": "auto",
                           "color": "#FFFFFF"
                        }]
                        "buttons": [
                           {
                              "text": "保存",
                              "fontSize": "16",
                              "width": "auto",
                              "color": "#FFFFFF"
                           }
                        ]
                     }
                  },
                  "componentPlaceholder": {
@@ -623,7 +656,8 @@
                     "u-picker": "view"
                  }
               }
            }, {
            },
            {
               "path": "help/tips",
               "style": {
                  "navigationBarTitleText": "",
@@ -631,7 +665,8 @@
                     "u-parse": "view"
                  }
               }
            }, {
            },
            {
               "path": "point/myPoint",
               "style": {
                  "navigationBarTitleText": "我的积分",
@@ -670,7 +705,8 @@
               "style": {
                  "navigationBarTitleText": "订单跟踪"
               }
            }, {
            },
            {
               "path": "activity/detail",
               "style": {
                  "navigationBarTitleText": "活动详情",
@@ -688,7 +724,8 @@
                     "u-image": "view"
                  }
               }
            }, {
            },
            {
               "path": "activity/myActivity",
               "style": {
                  "navigationBarTitleText": "我的活动",
@@ -706,7 +743,8 @@
                     "u-image": "view"
                  }
               }
            }, {
            },
            {
               "path": "activity/reportActivity",
               "style": {
                  "navigationBarTitleText": "活动",
@@ -725,7 +763,8 @@
                     "u-loadmore": "view"
                  }
               }
            }, {
            },
            {
               "path": "myCollect/myCollect",
               "style": {
                  "navigationBarTitleText": "我的收藏",
@@ -742,37 +781,35 @@
                     "u-navbar": "view",
                     "u-image": "view",
                     "u-loadmore": "view"
							
                  }

               }
            }

         ]

      },


      {
         "root": "pages/product",
         "pages": [{
         "pages": [
            {
               "path": "shopPage",
               "style": {
                  "navigationBarTitleText": "",
                  "navigationStyle": "custom"
               }
            }, {
            },
            {
               "path": "shopList",
               "style": {
                  "navigationBarTitleText": "",
                  "navigationStyle": "custom"
               }
            }, {
            },
            {
               "path": "licencePhoto",
               "style": {
                  "navigationBarTitleText": "营业执照"
               }
            }, {
            },
            {
               "path": "shopPageGoods",
               "style": {
                  "navigationBarTitleText": "",
@@ -911,51 +948,59 @@
                  }
               }
            }

         ]

      },
      {
         "root": "pages/floor",
         "pages": [{
            "path": "empty"
         }]

         "pages": [
            {
               "path": "empty"
            }
         ]
      },
      {
         "root": "pages/video",
         "pages": [{
         "pages": [
            {
               "path": "home-page",
               "style": {
                  "navigationBarTitleText": "TA的主页"
               }
            },
            {
               "path" : "video-play",
               "style" : 
               {
                  "navigationBarTitleText" : ""
               "path": "video-play",
               "style": {
                  "navigationBarTitleText": ""
               }
            },
            {
               "path" : "home-page-edit",
               "style" : 
               {
                  "navigationBarTitleText" : "主页信息修改"
               "path": "home-page-edit",
               "style": {
                  "navigationBarTitleText": "主页信息修改"
               }
            },
            {
               "path" : "video-edit",
               "path": "video-edit",
               "style": {
                  "navigationBarTitleText": "视频编辑"
               }
            },
            {
               "path" : "video-goods-detail",
               "style" : 
               {
                  "navigationBarTitleText" : "视频编辑"
                  "navigationBarTitleText" : "视频推荐商品",
                  "componentPlaceholder": {
                     "u-button": "view"
                  }
               }
            }
         ]
      },
      {
         "root": "pages/passport",
         "pages": [{
         "pages": [
            {
               "path": "login",
               "style": {
                  "navigationBarTitleText": "",
@@ -972,7 +1017,6 @@
                  }
               }
            },

            {
               "path": "entry/seller/index",
               "style": {
@@ -1060,12 +1104,11 @@
               }
            }
         ]

      },

      {
         "root": "pages/promotion",
         "pages": [{
         "pages": [
            {
               "path": "seckill",
               "style": {
                  "navigationBarTitleText": "限时抢购",
@@ -1078,7 +1121,6 @@
                  }
               }
            },

            {
               "path": "joinGroup",
               "style": {
@@ -1090,28 +1132,29 @@
                     "bounce": "none"
                  }
               }
            }, {
            },
            {
               "path": "lives",
               "style": {
                  "navigationStyle": "custom",
                  "navigationBarTextStyle": "black"

               }
            }, {
            },
            {
               "path": "bargain/list",
               "style": {
                  "navigationStyle": "custom",
                  "navigationBarTextStyle": "white"

               }
            }, {
            },
            {
               "path": "bargain/detail",
               "style": {
                  "navigationStyle": "custom",
                  "navigationBarTextStyle": "white"

               }
            }, {
            },
            {
               "path": "bargain/log",
               "style": {
                  "navigationBarTitleText": "砍价记录",
@@ -1120,28 +1163,26 @@
                     "u-empty": "view"
                  }
               }
            }, {
            },
            {
               "path": "point/detail",
               "style": {
                  "navigationStyle": "custom",
                  "navigationBarTextStyle": "white"

               }
            }, {
            },
            {
               "path": "point/pointList",
               "style": {
                  "navigationBarTitleText": "积分商城"


               }
            }

         ]

      },
      {
         "root": "pages/cart",
         "pages": [{
         "pages": [
            {
               "path": "coupon/myCoupon",
               "style": {
                  "navigationBarTitleText": "我的优惠券",
@@ -1166,7 +1207,6 @@
                  "navigationBarTitleText": "优惠券"
               }
            },

            {
               "path": "coupon/couponCenter",
               "style": {
@@ -1183,7 +1223,6 @@
                  "navigationBarTitleText": "支付订单",
                  "app-plus": {
                     "popGesture": "none" //禁止侧滑退出

                  }
               }
            },
@@ -1203,18 +1242,15 @@
               "path": "payment/shareOrderGoods",
               "style": {
                  "navigationBarTitleText": "",
                  "app-plus": {

                  }
                  "app-plus": {}
               }
            }

         ]

      },
      {
         "root": "pages/order",
         "pages": [{
         "pages": [
            {
               "path": "complain/complain",
               "style": {
                  "navigationBarTitleText": "订单商品投诉"
@@ -1224,6 +1260,17 @@
               "path": "complain/complainInfo",
               "style": {
                  "navigationBarTitleText": "投诉详情"
               }
            },
            {
               "path": "invoice/setInvoice",
               "style": {
                  "navigationBarTitleText": "",
                  "navigationStyle": "custom",
                  "componentPlaceholder": {
                     "u-popup": "view",
                     "u-input": "view"
                  }
               }
            },
            {
@@ -1284,7 +1331,6 @@
                  "navigationBarTitleText": "评价详情"
               }
            },

            {
               "path": "evaluate/releaseEvaluate",
               "style": {
@@ -1304,7 +1350,6 @@
                  }
               }
            },

            {
               "path": "afterSales/applyProgress",
               "style": {
@@ -1325,13 +1370,15 @@
                     "bounce": "none",
                     "titleNView": {
                        "titleColor": "#FFFFFF",
                        "buttons": [{
                           "text": "完成",
                           "fontSize": "14",
                           "color": "#FFFFFF",
                           "width": "36px"
                           // "background": "rgba(0,0,0,0)"
                        }]
                        "buttons": [
                           {
                              "text": "完成",
                              "fontSize": "14",
                              "color": "#FFFFFF",
                              "width": "36px"
                              // "background": "rgba(0,0,0,0)"
                           }
                        ]
                     }
                  }
               }
@@ -1369,11 +1416,40 @@
            {
               "path": "fillorder",
               "style": {
                  "navigationBarTitleText": "填写订单"
                  "navigationBarTitleText": "填写订单",
                  "componentPlaceholder": {
                     "u-image": "view",
                     "u-row": "view",
                     "u-col": "view",
                     "u-input": "view",
                     "u-icon": "view",
                     "u-select": "view",
                     "u-notice-bar": "view"
                  }
               }
            }
         ]
      },
      {
         "root": "pages/health",
         "pages": [{
            "path": "healthVideo",
            "style": {
               "navigationBarTitleText": "大健康"
            }
         }]
      }
      // ,
      // {
      //    "root": "pages/commodity-square",
      //    "pages": [{
      //       "path" : "commoditySquare",
      //       "style" :
      //       {
      //          "navigationBarTitleText" : "商品广场"
      //       }
      //    }]
      // }
   ],
   "globalStyle": {
      "navigationBarTextStyle": "black",
@@ -1385,7 +1461,6 @@
      "app-plus": {
         // 全局关闭回弹功能
         "bounce": "none"

      }
   },
   "tabBar": {
@@ -1394,14 +1469,16 @@
      "selectedColor": "#ff573e",
      "borderStyle": "black",
      "backgroundColor": "#ffffff",
      "list": [{
      "list": [
         {
            "pagePath": "pages/tabbar/index/home",
            "iconPath": "static/tabbar/home.png",
            "selectedIconPath": "static/tabbar/home-s.png",
            "text": "首页"
         },
         {
            "pagePath": "pages/tabbar/category/category",
            // "pagePath": "pages/tabbar/category/category",
            "pagePath": "pages/commodity-square/commoditySquare",
            "iconPath": "static/tabbar/category.png",
            "selectedIconPath": "static/tabbar/category-s.png",
            "text": "商城"