diff --git a/manifest.json b/manifest.json index 228c541..6d16812 100644 --- a/manifest.json +++ b/manifest.json @@ -1,74 +1,74 @@ { - "name": "shitong-app", - "appid": "", - "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": "wx4c2099a19c69664f", - "setting": { - "urlCheck": false, - "es6": false, - "postcss": false - }, - "usingComponents": true - }, - "mp-alipay": { - "usingComponents": true - }, - "mp-baidu": { - "usingComponents": true - }, - "mp-toutiao": { - "usingComponents": true - }, - "uniStatistics": { - "enable": false - }, - "vueVersion": "2" + "name" : "shitong-app", + "appid" : "__UNI__807D381", + "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" : "wx4c2099a19c69664f", + "setting" : { + "urlCheck" : false, + "es6" : false, + "postcss" : false + }, + "usingComponents" : true + }, + "mp-alipay" : { + "usingComponents" : true + }, + "mp-baidu" : { + "usingComponents" : true + }, + "mp-toutiao" : { + "usingComponents" : true + }, + "uniStatistics" : { + "enable" : false + }, + "vueVersion" : "2" } diff --git a/pages.json b/pages.json index f744de6..6b4860d 100644 --- a/pages.json +++ b/pages.json @@ -2,16 +2,8 @@ "easycom": { "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue" }, - "pages": [{ - "path": "pages/detail/detail", - "style": { - "navigationBarTitleText": "商品详情", - "navigationBarTextStyle": "white", - "navigationBarBackgroundColor": "#12CA64", - "enablePullDownRefresh": false - } + "pages": [ - }, { "path": "pages/index/index", "style": { @@ -47,11 +39,55 @@ "style": { "navigationBarTitleText": "我的", "navigationBarTextStyle": "white", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/news/news", + "style": { + "navigationBarTitleText": "行内新闻", + "navigationBarTextStyle": "white", "navigationBarBackgroundColor": "#12CA64", "enablePullDownRefresh": false } - } + }, { + "path": "pages/certifiedCj/certifiedCj", + "style": { + "navigationBarTitleText": "认证厂家", + "navigationBarTextStyle": "white", + "navigationBarBackgroundColor": "#12CA64", + "enablePullDownRefresh": false + } + + }, { + "path": "pages/detail/xwDetail/xwDetail", + "style": { + "navigationBarTitleText": "行业新闻详情", + "navigationBarTextStyle": "white", + "navigationBarBackgroundColor": "#12CA64", + "enablePullDownRefresh": false + } + + }, { + "path": "pages/detail/productsDetail/productsDetail", + "style": { + "navigationBarTitleText": "商品详情", + "navigationBarTextStyle": "white", + "navigationBarBackgroundColor": "#12CA64", + "enablePullDownRefresh": false + } + }, { + "path": "pages/detail/certifiedCjDetail/certifiedCjDetail", + "style": { + "navigationBarTitleText": "厂家信息", + "navigationBarTextStyle": "white", + "navigationBarBackgroundColor": "#12CA64", + "enablePullDownRefresh": false + } + + } ], "tabBar": { "color": "#CCCCCC", diff --git a/pages/certifiedCj/certifiedCj.vue b/pages/certifiedCj/certifiedCj.vue new file mode 100644 index 0000000..62c3d75 --- /dev/null +++ b/pages/certifiedCj/certifiedCj.vue @@ -0,0 +1,117 @@ + + + + + diff --git a/pages/detail/certifiedCjDetail/certifiedCjDetail.vue b/pages/detail/certifiedCjDetail/certifiedCjDetail.vue new file mode 100644 index 0000000..028f8b3 --- /dev/null +++ b/pages/detail/certifiedCjDetail/certifiedCjDetail.vue @@ -0,0 +1,145 @@ + + + + + diff --git a/pages/detail/detail.vue b/pages/detail/productsDetail/productsDetail.vue similarity index 98% rename from pages/detail/detail.vue rename to pages/detail/productsDetail/productsDetail.vue index 2cb7162..c0f092f 100644 --- a/pages/detail/detail.vue +++ b/pages/detail/productsDetail/productsDetail.vue @@ -49,7 +49,7 @@ tagOne: '无添加剂', tagTwo: '无添加剂', time: '2022年12月04日', - content: '

走马灯

' + content: '

一级标题


二级标题

' }] } }, diff --git a/pages/detail/xwDetail/xwDetail.vue b/pages/detail/xwDetail/xwDetail.vue new file mode 100644 index 0000000..1c2a730 --- /dev/null +++ b/pages/detail/xwDetail/xwDetail.vue @@ -0,0 +1,67 @@ + + + + + diff --git a/pages/index/index.vue b/pages/index/index.vue index 6f6bcb7..f5252a6 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -174,7 +174,7 @@ //点击图片跳转到详情页 toDetailPage() { uni.navigateTo({ - url: '/pages/detail/detail' + url: '/pages/detail/productsDetail/productsDetail' }) } } @@ -219,6 +219,8 @@ background: #FFFFFF; border-radius: 24rpx; + box-shadow: 0px 2px 4px 0px rgba(206, 206, 206, 0.5); + .u-grid { padding-top: 30rpx; @@ -254,7 +256,7 @@ } .products_box { - padding: 18rpx; + padding: 10rpx; .u-grid-item { @@ -264,7 +266,7 @@ top: 0; .u-image__image { - margin-left: 3px; + margin-left: 6px; } .img_tag { diff --git a/pages/my/my.vue b/pages/my/my.vue index 9b753b3..3cc6540 100644 --- a/pages/my/my.vue +++ b/pages/my/my.vue @@ -1,6 +1,76 @@ + + + diff --git a/pages/news/news.vue b/pages/news/news.vue new file mode 100644 index 0000000..3f8af7d --- /dev/null +++ b/pages/news/news.vue @@ -0,0 +1,118 @@ + + + + + diff --git a/pages/report/report.vue b/pages/report/report.vue index 6ce9d63..53b6348 100644 --- a/pages/report/report.vue +++ b/pages/report/report.vue @@ -1,5 +1,442 @@ + + + + diff --git a/static/classify/sy_icon_cy@2x.png b/static/classify/sy_icon_cy@2x.png deleted file mode 100644 index dfb1124..0000000 Binary files a/static/classify/sy_icon_cy@2x.png and /dev/null differ diff --git a/static/classify/sy_icon_gs@2x.png b/static/classify/sy_icon_gs@2x.png deleted file mode 100644 index b8c85e1..0000000 Binary files a/static/classify/sy_icon_gs@2x.png and /dev/null differ diff --git a/static/classify/sy_icon_hp@2x.png b/static/classify/sy_icon_hp@2x.png deleted file mode 100644 index 45efa9c..0000000 Binary files a/static/classify/sy_icon_hp@2x.png and /dev/null differ diff --git a/static/classify/sy_icon_hz@2x.png b/static/classify/sy_icon_hz@2x.png deleted file mode 100644 index 70a124e..0000000 Binary files a/static/classify/sy_icon_hz@2x.png and /dev/null differ diff --git a/static/classify/sy_icon_ls@2x.png b/static/classify/sy_icon_ls@2x.png deleted file mode 100644 index ac04b48..0000000 Binary files a/static/classify/sy_icon_ls@2x.png and /dev/null differ diff --git a/static/classify/sy_icon_np@2x.png b/static/classify/sy_icon_np@2x.png deleted file mode 100644 index 7d056a4..0000000 Binary files a/static/classify/sy_icon_np@2x.png and /dev/null differ diff --git a/static/classify/sy_icon_rs@2x.png b/static/classify/sy_icon_rs@2x.png deleted file mode 100644 index 9558226..0000000 Binary files a/static/classify/sy_icon_rs@2x.png and /dev/null differ diff --git a/static/classify/sy_icon_sj@2x.png b/static/classify/sy_icon_sj@2x.png deleted file mode 100644 index f7db782..0000000 Binary files a/static/classify/sy_icon_sj@2x.png and /dev/null differ diff --git a/static/classify/sy_icon_tw@2x.png b/static/classify/sy_icon_tw@2x.png deleted file mode 100644 index c529e55..0000000 Binary files a/static/classify/sy_icon_tw@2x.png and /dev/null differ diff --git a/static/classify/sy_icon_yp@2x.png b/static/classify/sy_icon_yp@2x.png deleted file mode 100644 index 182d27a..0000000 Binary files a/static/classify/sy_icon_yp@2x.png and /dev/null differ diff --git a/static/detail/cj_bg.png b/static/detail/cj_bg.png new file mode 100644 index 0000000..c5ba857 Binary files /dev/null and b/static/detail/cj_bg.png differ diff --git a/static/detail/xiangqing_icon_shoucang@2x.png b/static/detail/xiangqing_icon_shoucang@2x.png deleted file mode 100644 index 96d2dba..0000000 Binary files a/static/detail/xiangqing_icon_shoucang@2x.png and /dev/null differ diff --git a/static/detail/xp_icon_ysc@2x.png b/static/detail/xp_icon_ysc@2x.png deleted file mode 100644 index 04e32a6..0000000 Binary files a/static/detail/xp_icon_ysc@2x.png and /dev/null differ diff --git a/static/detail/zhanwei_xppx@2x.png b/static/detail/zhanwei_xppx@2x.png deleted file mode 100644 index 80e93db..0000000 Binary files a/static/detail/zhanwei_xppx@2x.png and /dev/null differ diff --git a/static/my/avatar.png b/static/my/avatar.png new file mode 100644 index 0000000..c961de7 Binary files /dev/null and b/static/my/avatar.png differ diff --git a/static/my/wo_icon_bj1.png b/static/my/wo_icon_bj1.png new file mode 100644 index 0000000..e288518 Binary files /dev/null and b/static/my/wo_icon_bj1.png differ diff --git a/static/my/wo_icon_pthy.png b/static/my/wo_icon_pthy.png new file mode 100644 index 0000000..623fe0d Binary files /dev/null and b/static/my/wo_icon_pthy.png differ diff --git a/static/my/wo_icon_vip.png b/static/my/wo_icon_vip.png new file mode 100644 index 0000000..4bb24bf Binary files /dev/null and b/static/my/wo_icon_vip.png differ diff --git a/static/products/sy_bb@2x(1).png b/static/products/sy_bb@2x(1).png deleted file mode 100644 index 157d9a7..0000000 Binary files a/static/products/sy_bb@2x(1).png and /dev/null differ diff --git a/static/products/sy_bb@2x.png b/static/products/sy_bb@2x.png deleted file mode 100644 index 157d9a7..0000000 Binary files a/static/products/sy_bb@2x.png and /dev/null differ diff --git a/static/products/sy_icon_sjf(1).png b/static/products/sy_icon_sjf(1).png deleted file mode 100644 index 1ccc04f..0000000 Binary files a/static/products/sy_icon_sjf(1).png and /dev/null differ diff --git a/static/products/sy_icon_sjf@2x(1).png b/static/products/sy_icon_sjf@2x(1).png deleted file mode 100644 index 443b754..0000000 Binary files a/static/products/sy_icon_sjf@2x(1).png and /dev/null differ diff --git a/static/products/sy_icon_sjf@2x.png b/static/products/sy_icon_sjf@2x.png deleted file mode 100644 index 443b754..0000000 Binary files a/static/products/sy_icon_sjf@2x.png and /dev/null differ diff --git a/static/products/zhanwei_dg@2x(1).png b/static/products/zhanwei_dg@2x(1).png deleted file mode 100644 index 89f2726..0000000 Binary files a/static/products/zhanwei_dg@2x(1).png and /dev/null differ diff --git a/static/products/zhanwei_dg@2x(2).png b/static/products/zhanwei_dg@2x(2).png deleted file mode 100644 index eac9677..0000000 Binary files a/static/products/zhanwei_dg@2x(2).png and /dev/null differ diff --git a/static/products/zhanwei_dg@2x(3).png b/static/products/zhanwei_dg@2x(3).png deleted file mode 100644 index 4cf5e1c..0000000 Binary files a/static/products/zhanwei_dg@2x(3).png and /dev/null differ diff --git a/static/products/zhanwei_dg@2x.png b/static/products/zhanwei_dg@2x.png deleted file mode 100644 index 6a148ce..0000000 Binary files a/static/products/zhanwei_dg@2x.png and /dev/null differ diff --git a/static/tabBar/sy_icon_cp.png b/static/tabBar/sy_icon_cp.png deleted file mode 100644 index 7d03891..0000000 Binary files a/static/tabBar/sy_icon_cp.png and /dev/null differ diff --git a/static/tabBar/sy_icon_cp@2x.png b/static/tabBar/sy_icon_cp@2x.png deleted file mode 100644 index 58a2e16..0000000 Binary files a/static/tabBar/sy_icon_cp@2x.png and /dev/null differ diff --git a/static/tabBar/sy_icon_cph.png b/static/tabBar/sy_icon_cph.png deleted file mode 100644 index 0630473..0000000 Binary files a/static/tabBar/sy_icon_cph.png and /dev/null differ diff --git a/static/tabBar/sy_icon_cph@2x.png b/static/tabBar/sy_icon_cph@2x.png deleted file mode 100644 index f8d69dc..0000000 Binary files a/static/tabBar/sy_icon_cph@2x.png and /dev/null differ diff --git a/static/tabBar/sy_icon_cy.png b/static/tabBar/sy_icon_cy.png deleted file mode 100644 index 463fc8f..0000000 Binary files a/static/tabBar/sy_icon_cy.png and /dev/null differ diff --git a/static/tabBar/sy_icon_cy@2x.png b/static/tabBar/sy_icon_cy@2x.png deleted file mode 100644 index 2234b62..0000000 Binary files a/static/tabBar/sy_icon_cy@2x.png and /dev/null differ diff --git a/static/tabBar/sy_icon_cyh.png b/static/tabBar/sy_icon_cyh.png deleted file mode 100644 index 6336f2b..0000000 Binary files a/static/tabBar/sy_icon_cyh.png and /dev/null differ diff --git a/static/tabBar/sy_icon_cyh@2x.png b/static/tabBar/sy_icon_cyh@2x.png deleted file mode 100644 index a27a843..0000000 Binary files a/static/tabBar/sy_icon_cyh@2x.png and /dev/null differ diff --git a/static/tabBar/sy_icon_hyh.png b/static/tabBar/sy_icon_hyh.png deleted file mode 100644 index ab63878..0000000 Binary files a/static/tabBar/sy_icon_hyh.png and /dev/null differ diff --git a/static/tabBar/sy_icon_hyh@2x.png b/static/tabBar/sy_icon_hyh@2x.png deleted file mode 100644 index 90f2be3..0000000 Binary files a/static/tabBar/sy_icon_hyh@2x.png and /dev/null differ diff --git a/static/tabBar/sy_icon_sy(1).png b/static/tabBar/sy_icon_sy(1).png deleted file mode 100644 index 764206c..0000000 Binary files a/static/tabBar/sy_icon_sy(1).png and /dev/null differ diff --git a/static/tabBar/sy_icon_sy.png b/static/tabBar/sy_icon_sy.png deleted file mode 100644 index 44e2347..0000000 Binary files a/static/tabBar/sy_icon_sy.png and /dev/null differ diff --git a/static/tabBar/sy_icon_sy@2x(1).png b/static/tabBar/sy_icon_sy@2x(1).png deleted file mode 100644 index ecc038c..0000000 Binary files a/static/tabBar/sy_icon_sy@2x(1).png and /dev/null differ diff --git a/static/tabBar/sy_icon_sy@2x.png b/static/tabBar/sy_icon_sy@2x.png deleted file mode 100644 index c982d1c..0000000 Binary files a/static/tabBar/sy_icon_sy@2x.png and /dev/null differ diff --git a/static/tabBar/sy_icon_syh.png b/static/tabBar/sy_icon_syh.png deleted file mode 100644 index b29f7c3..0000000 Binary files a/static/tabBar/sy_icon_syh.png and /dev/null differ diff --git a/static/tabBar/sy_icon_syh@2x.png b/static/tabBar/sy_icon_syh@2x.png deleted file mode 100644 index 7d9e4e7..0000000 Binary files a/static/tabBar/sy_icon_syh@2x.png and /dev/null differ diff --git a/static/tabBar/sy_icon_wd.png b/static/tabBar/sy_icon_wd.png deleted file mode 100644 index 78ef662..0000000 Binary files a/static/tabBar/sy_icon_wd.png and /dev/null differ diff --git a/static/tabBar/sy_icon_wd@2x.png b/static/tabBar/sy_icon_wd@2x.png deleted file mode 100644 index 8d6ce58..0000000 Binary files a/static/tabBar/sy_icon_wd@2x.png and /dev/null differ diff --git a/static/tabBar/sy_icon_wdh.png b/static/tabBar/sy_icon_wdh.png deleted file mode 100644 index ff78fc2..0000000 Binary files a/static/tabBar/sy_icon_wdh.png and /dev/null differ diff --git a/static/tabBar/sy_icon_wdh@2x.png b/static/tabBar/sy_icon_wdh@2x.png deleted file mode 100644 index 7b62bf3..0000000 Binary files a/static/tabBar/sy_icon_wdh@2x.png and /dev/null differ