diff --git a/App.vue b/App.vue index eda9c4e..549dbe4 100644 --- a/App.vue +++ b/App.vue @@ -1,5 +1,4 @@ - \ No newline at end of file diff --git a/manifest.json b/manifest.json index 1d7f366..942d70f 100644 --- a/manifest.json +++ b/manifest.json @@ -1,73 +1,79 @@ { - "name" : "city-store-transfer", - "appid" : "__UNI__F3EA0D6", - "description" : "", - "versionName" : "1.0.0", - "versionCode" : "100", - "transformPx" : false, - /* 5+App特有相关 */ - "app-plus" : { - "usingComponents" : true, - "nvueStyleCompiler" : "uni-app", - "compilerVersion" : 3, - "splashscreen" : { - "alwaysShowBeforeRender" : true, - "waiting" : true, - "autoclose" : true, - "delay" : 0 - }, - /* 模块配置 */ - "modules" : {}, - /* 应用发布信息 */ - "distribute" : { - /* android打包配置 */ - "android" : { - "permissions" : [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - /* ios打包配置 */ - "ios" : {}, - /* SDK配置 */ - "sdkConfigs" : {} - } - }, - /* 快应用特有相关 */ - "quickapp" : {}, - /* 小程序特有相关 */ - "mp-weixin" : { - "appid" : "wxda178d12ae834c45", - "setting" : { - "urlCheck" : false - }, - "usingComponents" : true, - "permission" : {} - }, - "mp-alipay" : { - "usingComponents" : true - }, - "mp-baidu" : { - "usingComponents" : true - }, - "mp-toutiao" : { - "usingComponents" : true - }, - "uniStatistics" : { - "enable" : false - }, - "vueVersion" : "2" -} + "name": "city-store-transfer", + "appid": "__UNI__F3EA0D6", + "description": "", + "versionName": "1.0.0", + "versionCode": "100", + "transformPx": false, + /* 5+App特有相关 */ + "app-plus": { + "usingComponents": true, + "nvueStyleCompiler": "uni-app", + "compilerVersion": 3, + "splashscreen": { + "alwaysShowBeforeRender": true, + "waiting": true, + "autoclose": true, + "delay": 0 + }, + /* 模块配置 */ + "modules": {}, + /* 应用发布信息 */ + "distribute": { + /* android打包配置 */ + "android": { + "permissions": [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ] + }, + /* ios打包配置 */ + "ios": {}, + /* SDK配置 */ + "sdkConfigs": {} + } + }, + /* 快应用特有相关 */ + "quickapp": {}, + /* 小程序特有相关 */ + "mp-weixin": { + "appid": "wxda178d12ae834c45", + "setting": { + "urlCheck": false + }, + "usingComponents": true, + "permission": { + // 获取当前的地理位置、速度 配置 + "scope.userLocation": { + "desc": "你的位置信息将用于小程序位置接口的效果展示" + } + } + + }, + "mp-alipay": { + "usingComponents": true + }, + "mp-baidu": { + "usingComponents": true + }, + "mp-toutiao": { + "usingComponents": true + }, + "uniStatistics": { + "enable": false + }, + "vueVersion": "2" +} \ No newline at end of file diff --git a/pages.json b/pages.json index 3d463d4..9e0e6da 100644 --- a/pages.json +++ b/pages.json @@ -1,167 +1,140 @@ { - "easycom" : { - "autoscan" : true, //是否自动扫描组件 - "custom" : { - "^u-(.*)" : "uview-ui/components/u-$1/u-$1.vue", - "^ua-(.*)" : "@/components/uview-ui/components/u-$1/u-$1.vue", - "^customer-(.*)" : "@/components/uni-$1.vue" // 匹配components目录内的vue文件 - } - }, - "pages" : [ - //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages - { - "path" : "pages/index/index", - "style" : { - "navigationBarTitleText" : "速配商铺", - "navigationBarTextStyle" : "black", - "navigationBarBackgroundColor" : "#FFFFFF", - //导航栏取消 - // "navigationStyle": "custom", - //是否开启下拉刷新 - "enablePullDownRefresh" : true - } - }, - { - "path" : "pages/shopTransfer/shopTransfer", - "style" : { - "navigationBarTitleText" : "店铺转让", - "navigationBarTextStyle" : "black", - "navigationBarBackgroundColor" : "#FFFFFF", - "enablePullDownRefresh" : false - } - }, - //+ - { - "path" : "pages/shopAddress/shopAddress", - "style" : { - "navigationBarTitleText" : "找店地址", - "navigationBarTextStyle" : "black", - "navigationBarBackgroundColor" : "#FFFFFF", - "enablePullDownRefresh" : false - } - }, - { - "path" : "pages/my/my", - "style" : { - "navigationBarTitleText" : "我的", - "navigationBarTextStyle" : "black", - "navigationBarBackgroundColor" : "#FFFFFF", - "enablePullDownRefresh" : false - } - }, - { - "path" : "pages/publish/publish", - "style" : { - "navigationBarTitleText" : "", - "enablePullDownRefresh" : false - } - }, - { - "path" : "pages/detail/detail", - "style" : { - "navigationBarTitleText" : "商品详情" + "easycom": { + "autoscan": true, //是否自动扫描组件 + "custom": { + "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue", + "^ua-(.*)": "@/components/uview-ui/components/u-$1/u-$1.vue", + "^customer-(.*)": "@/components/uni-$1.vue" // 匹配components目录内的vue文件 + } + }, + "pages": [ + //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages + { + "path": "pages/index/index", + "style": { + "navigationBarTitleText": "速配商铺", + "navigationBarTextStyle": "black", + "navigationBarBackgroundColor": "#FFFFFF", + //导航栏取消 + // "navigationStyle": "custom", + //是否开启下拉刷新 + "enablePullDownRefresh": true } - } - - ,{ - "path" : "pages/published/published", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": true - } - - } - ,{ - "path" : "pages/publish/publishTransfer/publishTransfer", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - - } - ,{ - "path" : "pages/publish/publishAddress/publishAddress", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - - } - ,{ - "path" : "pages/publish/publishRent/publishRent", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - - } - ,{ - "path" : "pages/publish/publishInvestment/publishInvestment", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - - } - ], - "tabBar" : { - "color" : "#CCCCCC", - "borderStyle" : "white", - "backgroundColor" : "#FFFFFF", - "custom" : true, - "list" : [ - { - "pagePath" : "pages/index/index", - "text" : "首页", - "iconPath" : "static/tabbar/di_icon_syh.png", - "selectedIconPath" : "static/tabbar/di_icon_sy.png" - }, - { - "pagePath" : "pages/shopTransfer/shopTransfer", - "text" : "店铺转让", - "iconPath" : "static/tabbar/di_icon_zrh.png", - "selectedIconPath" : "static/tabbar/di_icon_zr.png" - }, - { - "pagePath" : "pages/publish/publish", - "text" : "发布", - "iconPath" : "static/tabbar/di_icon_fb.png", - "selectedIconPath" : "static/tabbar/di_icon_fb.png" - }, - { - "pagePath" : "pages/shopAddress/shopAddress", - "text" : "找店地址", - "iconPath" : "static/tabbar/di_icon_dzh.png", - "selectedIconPath" : "static/tabbar/di_icon_dz.png" - }, - { - "pagePath" : "pages/my/my", - "text" : "店铺转让", - "iconPath" : "static/tabbar/di_icon_wdh.png", - "selectedIconPath" : "static/tabbar/di_icon_wd.png" - } - ] - }, - "globalStyle" : { - "navigationBarTextStyle" : "black", - "navigationBarTitleText" : "uni-app", - "navigationBarBackgroundColor" : "#F8F8F8", - "backgroundColor" : "#F8F8F8" - }, - "uniIdRouter" : {}, - "condition" : { //模式配置,仅开发期间生效 - "current": 0, //当前激活的模式(list 的索引项) - "list": [ + }, + { + "path": "pages/shopTransfer/shopTransfer", + "style": { + "navigationBarTitleText": "店铺转让", + "navigationBarTextStyle": "black", + "navigationBarBackgroundColor": "#FFFFFF", + "enablePullDownRefresh": false + } + }, + //+ + { + "path": "pages/shopAddress/shopAddress", + "style": { + "navigationBarTitleText": "找店地址", + "navigationBarTextStyle": "black", + "navigationBarBackgroundColor": "#FFFFFF", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/my/my", + "style": { + "navigationBarTitleText": "我的", + "navigationBarTextStyle": "black", + "navigationBarBackgroundColor": "#FFFFFF", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/detail/detail", + "style": { + "navigationBarTitleText": "商品详情" + } + }, { + "path": "pages/published/published", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": true + } + }, { + "path": "pages/publish/publishTransfer/publishTransfer", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + + }, { + "path": "pages/publish/publishAddress/publishAddress", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + + }, { + "path": "pages/publish/publishRent/publishRent", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + + }, { + "path": "pages/publish/publishInvestment/publishInvestment", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + + } + ], + "tabBar": { + "color": "#CCCCCC", + "borderStyle": "white", + "backgroundColor": "#FFFFFF", + "custom": true, + "list": [{ + "pagePath": "pages/index/index", + "text": "首页", + "iconPath": "static/tabbar/di_icon_syh.png", + "selectedIconPath": "static/tabbar/di_icon_sy.png" + }, { - "name": "", //模式名称 - "path": "", //启动页面,必选 - "query": "" //启动参数,在页面的onLoad函数里面得到 + "pagePath": "pages/shopTransfer/shopTransfer", + "text": "店铺转让", + "iconPath": "static/tabbar/di_icon_zrh.png", + "selectedIconPath": "static/tabbar/di_icon_zr.png" + }, + + { + "pagePath": "pages/shopAddress/shopAddress", + "text": "找店地址", + "iconPath": "static/tabbar/di_icon_dzh.png", + "selectedIconPath": "static/tabbar/di_icon_dz.png" + }, + { + "pagePath": "pages/my/my", + "text": "店铺转让", + "iconPath": "static/tabbar/di_icon_wdh.png", + "selectedIconPath": "static/tabbar/di_icon_wd.png" } ] + }, + "globalStyle": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "uni-app", + "navigationBarBackgroundColor": "#F8F8F8", + "backgroundColor": "#F8F8F8" + }, + "uniIdRouter": {}, + "condition": { //模式配置,仅开发期间生效 + "current": 0, //当前激活的模式(list 的索引项) + "list": [{ + "name": "", //模式名称 + "path": "", //启动页面,必选 + "query": "" //启动参数,在页面的onLoad函数里面得到 + }] } -} +} \ No newline at end of file diff --git a/pages/index/childComps/HomeHeader.vue b/pages/index/childComps/HomeHeader.vue deleted file mode 100644 index 6a3e041..0000000 --- a/pages/index/childComps/HomeHeader.vue +++ /dev/null @@ -1,127 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/index/index.vue b/pages/index/index.vue index 026bb9b..22f624b 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,66 +1,54 @@ @@ -85,11 +74,12 @@ background-color: $uni-bg-color-grey; width: 100%; } + .nav-card { margin: 15px 7px; padding: 10px 0; background-color: $uni-bg-color; - + border-radius: $uni-border-radius-lg; box-shadow: 0 3px 3px 0 $u-border-color; @@ -97,5 +87,4 @@ font-size: 14px; } } - \ No newline at end of file diff --git a/pages/publish/publish.vue b/pages/publish/publish.vue deleted file mode 100644 index bbf207b..0000000 --- a/pages/publish/publish.vue +++ /dev/null @@ -1,32 +0,0 @@ - - - - - diff --git a/static/tabbar/di_icon_dz.png b/static/tabbar/di_icon_dz.png index 704d075..eec0de0 100644 Binary files a/static/tabbar/di_icon_dz.png and b/static/tabbar/di_icon_dz.png differ diff --git a/static/tabbar/di_icon_fb.png b/static/tabbar/di_icon_fb.png index 0db81a0..28a523f 100644 Binary files a/static/tabbar/di_icon_fb.png and b/static/tabbar/di_icon_fb.png differ diff --git a/static/tabbar/di_icon_fb@2x.png b/static/tabbar/di_icon_fb@2x.png deleted file mode 100644 index 02731a3..0000000 Binary files a/static/tabbar/di_icon_fb@2x.png and /dev/null differ diff --git a/static/tabbar/di_icon_sy.png b/static/tabbar/di_icon_sy.png index 2ff2917..114c010 100644 Binary files a/static/tabbar/di_icon_sy.png and b/static/tabbar/di_icon_sy.png differ diff --git a/static/tabbar/di_icon_wd.png b/static/tabbar/di_icon_wd.png index 72ffc01..95c73a6 100644 Binary files a/static/tabbar/di_icon_wd.png and b/static/tabbar/di_icon_wd.png differ diff --git a/static/tabbar/di_icon_zr.png b/static/tabbar/di_icon_zr.png index ccd65b8..c91d34a 100644 Binary files a/static/tabbar/di_icon_zr.png and b/static/tabbar/di_icon_zr.png differ