From 339fada3e1e4bdd525e571e1fe792e0fb7e458c1 Mon Sep 17 00:00:00 2001 From: itgaojian163 Date: Sun, 12 Feb 2023 19:42:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=9F=8E=E5=95=86=E5=93=81=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 10 ++- app.json | 16 +++- components/loading/pageloading.js | 23 ++++++ components/loading/pageloading.json | 4 + components/loading/pageloading.wxml | 5 ++ components/loading/pageloading.wxss | 23 ++++++ images/ic_empty_data.png | Bin 0 -> 944 bytes images/loading-small.gif | Bin 0 -> 9840 bytes pages/index/index.wxml | 6 +- pages/index/index.wxss | 1 + pages/newsList/newsList.wxml | 6 +- pages/newsList/newsList.wxss | 1 + pages/shop/shopcategory.js | 57 ++++++++++++++ pages/shop/shopcategory.json | 3 + pages/shop/shopcategory.wxml | 27 +++++++ pages/shop/shopcategory.wxss | 112 ++++++++++++++++++++++++++++ project.private.config.json | 4 + subpages/goodslist/goodslist.js | 73 ++++++++++++++++++ subpages/goodslist/goodslist.json | 8 ++ subpages/goodslist/goodslist.wxml | 26 +++++++ subpages/goodslist/goodslist.wxss | 96 ++++++++++++++++++++++++ utils/restAjax.js | 3 +- 22 files changed, 490 insertions(+), 14 deletions(-) create mode 100644 components/loading/pageloading.js create mode 100644 components/loading/pageloading.json create mode 100644 components/loading/pageloading.wxml create mode 100644 components/loading/pageloading.wxss create mode 100644 images/ic_empty_data.png create mode 100644 images/loading-small.gif create mode 100644 pages/shop/shopcategory.js create mode 100644 pages/shop/shopcategory.json create mode 100644 pages/shop/shopcategory.wxml create mode 100644 pages/shop/shopcategory.wxss create mode 100644 project.private.config.json create mode 100644 subpages/goodslist/goodslist.js create mode 100644 subpages/goodslist/goodslist.json create mode 100644 subpages/goodslist/goodslist.wxml create mode 100644 subpages/goodslist/goodslist.wxss diff --git a/app.js b/app.js index d27dc5b..53e31aa 100644 --- a/app.js +++ b/app.js @@ -3,8 +3,8 @@ var restAjax = require('utils/restAjax.js'); var dialog = require('utils/dialog.js'); // + 'https://www.xzszwhy.cn/usercenter' App({ - loginUrl:restAjax.baseUrl, - usercenterUrl:restAjax.baseUrl, + loginUrl: restAjax.baseUrl, + usercenterUrl: restAjax.baseUrl, newsUrl: restAjax.baseUrl, newsContentUrl: restAjax.baseUrl, libraryUrl: restAjax.baseUrl, @@ -16,7 +16,9 @@ App({ liveUrl: restAjax.baseUrl, liveRecordUrl: restAjax.baseUrl, socialUrl: restAjax.baseUrl, + shopUrl: restAjax.url + "xzshop", restAjax: restAjax, + shopImgUrl: restAjax.url + "xzshop/route/file/download/true/", dialog: dialog, onLaunch: function () { // 展示本地存储能力 @@ -53,7 +55,7 @@ App({ }, globalData: { userInfo: null, - curLat:-1, - curLng:-1, + curLat: -1, + curLng: -1, } }) \ No newline at end of file diff --git a/app.json b/app.json index 7f0eea5..0fbed9d 100644 --- a/app.json +++ b/app.json @@ -37,8 +37,15 @@ "pages/myActivity/myActivity", "pages/myVolunteerTeam/myVolunteerTeam", "pages/myVolunteerActivity/myVolunteerActivity", - "pages/serviceActivityDetail/serviceActivityDetail" + "pages/serviceActivityDetail/serviceActivityDetail", + "pages/shop/shopcategory" ], + "subPackages": [{ + "root": "subpages/goodslist", + "pages": [ + "goodslist" + ] + }], "window": { "backgroundTextStyle": "light", "navigationBarBackgroundColor": "#9F1512", @@ -68,9 +75,9 @@ "selectedIconPath": "images/venue-on.png" }, { - "pagePath": "pages/heritage/heritage", + "pagePath": "pages/shop/shopcategory", "iconPath": "images/culture.png", - "text": "文化", + "text": "商城", "selectedIconPath": "images/culture-on.png" }, { @@ -81,6 +88,9 @@ } ] }, + "usingComponents": { + "page-loading": "/components/loading/pageloading" + }, "permission": { "scope.userLocation": { "desc": "你的位置信息将用于您当前所在位置" diff --git a/components/loading/pageloading.js b/components/loading/pageloading.js new file mode 100644 index 0000000..7c20516 --- /dev/null +++ b/components/loading/pageloading.js @@ -0,0 +1,23 @@ +// components/loading/pageloading.js +Component({ + /** + * 组件的属性列表 + */ + properties: { + + }, + + /** + * 组件的初始数据 + */ + data: { + + }, + + /** + * 组件的方法列表 + */ + methods: { + + } +}) diff --git a/components/loading/pageloading.json b/components/loading/pageloading.json new file mode 100644 index 0000000..e8cfaaf --- /dev/null +++ b/components/loading/pageloading.json @@ -0,0 +1,4 @@ +{ + "component": true, + "usingComponents": {} +} \ No newline at end of file diff --git a/components/loading/pageloading.wxml b/components/loading/pageloading.wxml new file mode 100644 index 0000000..2115a2b --- /dev/null +++ b/components/loading/pageloading.wxml @@ -0,0 +1,5 @@ + + + + 加载中... + \ No newline at end of file diff --git a/components/loading/pageloading.wxss b/components/loading/pageloading.wxss new file mode 100644 index 0000000..f192973 --- /dev/null +++ b/components/loading/pageloading.wxss @@ -0,0 +1,23 @@ +/* components/loading/pageloading.wxss */ +.page-loading-box { + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; + background: rgba(255, 255, 255, 1); + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; +} + +.page-loading-box image { + width: 128rpx; + height: 128rpx; +} + +.page-loading-box .text { + margin-top: 20rpx; + font-size: 28rpx; +} \ No newline at end of file diff --git a/images/ic_empty_data.png b/images/ic_empty_data.png new file mode 100644 index 0000000000000000000000000000000000000000..791e76e0ba130ce529d821d71e08c8fe249534a5 GIT binary patch literal 944 zcmV;h15f;kP)Px&YDq*vR9HvNnBh^}Fc5`T9ne8Y1waL1X&_KRNC%_>NChDkgc9I)W>}~oP(dyg z1S)XmGpie0mSp>UGda!NaGWJsZ};unT?MHOGrJLy8&!R%&HLZaLg@fzb}1s~A_9O% zRRz#ajv9yy5#a-fTUEWyAuzK;5jhZ%{RIeDZYciF9z_uBWM6n{Kz^J3*7Ab0 zlCf&R`T^U5Uu0s`k$0bZsduBB#(c1u_eSnVEd!QS4KR6@lZ!-`+ndFGuso9kA8@|9Opd9vB+_b zvois-)6J}TGw@puDuM84C?LR5$$^3e52$#K7gfy$slQ|m!pxZWsRH0xRqJ?iZQh$+Bpb9MrRmjc96Z=9T*JWc_)Dk z->Zlm=CnKowi6(xSbOK`6c6YbpK`oaI4{(`mok56-Q8k8NLAgODh zQSAJn*;Me`agggN~DfP2e zbWN@|4s7=t)+TFnOVI)`Gvb7}TB+($#VB|J%A#Pz5bOBfy&9q?$zBz8_gxBt@*NA( z97S(n$vf{B`Hh@02yPGT=aE+TfjlslSQmll1Zk^M{y(y}@}@qP>Zn~R6up=jJLo8# z;uXv~P(t|Q2jRY_E%HJL@Eog5x}pgoq^0_LT?hdcE+m_`)(B2OJ3%3i~x`vw{`ipKGHw721+Rz Sfi0r|0000d#}CLde*bG;aW<{_6Pt1fC2n| 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 Q9B~Ogru}hX1Or_AFT+oqvj6}9 literal 0 HcmV?d00001 diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 115657e..1cd2470 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -85,7 +85,7 @@ - + {{item.newsContentTitle}} @@ -104,13 +104,13 @@ - + {{item.newsContentTitle}} - + 来源：{{item.newsContentResource}} diff --git a/pages/index/index.wxss b/pages/index/index.wxss index 64d5f2b..3c1f6b8 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -94,6 +94,7 @@ } .news-big-pic image{ width: 100%; + height: 380rpx; } .news-small-pic image{ width: 30%; diff --git a/pages/newsList/newsList.wxml b/pages/newsList/newsList.wxml index 575348a..a8c8f75 100644 --- a/pages/newsList/newsList.wxml +++ b/pages/newsList/newsList.wxml @@ -38,7 +38,7 @@ - + {{item.newsContentTitle}} @@ -57,13 +57,13 @@ - + {{item.newsContentTitle}} - + 来源：{{item.newsContentResource}} diff --git a/pages/newsList/newsList.wxss b/pages/newsList/newsList.wxss index a876635..b27cd4d 100644 --- a/pages/newsList/newsList.wxss +++ b/pages/newsList/newsList.wxss @@ -131,6 +131,7 @@ } .news-big-pic image{ width: 100%; + height: 380rpx; } .news-big-pic image.play-btn{ position: absolute; diff --git a/pages/shop/shopcategory.js b/pages/shop/shopcategory.js new file mode 100644 index 0000000..833d7a7 --- /dev/null +++ b/pages/shop/shopcategory.js @@ -0,0 +1,57 @@ +// pages/shop/shopcat.js +var app = getApp(); +Page({ + + /** + * 页面的初始数据 + */ + data: { + categoryOneList: [], + categorySeconList: [], + currentIndex: 0, + isHidePageLoading: false + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + this.getCategroyList(); + }, + getCategroyList() { + var _self = this + app.restAjax.get(app.restAjax.path('{shopUrl}/app/category/listztreerelease', [app.shopUrl]), null, null, function (code, data) { + if (data.length == 0) { + app.dialog.msg('暂无数据'); + return; + } + console.log(data) + _self.setData({ + categoryOneList: data, + categorySeconList: data[0].subList, + isHidePageLoading: true + }) + }, function (code, data) { + app.dialog.msg(data.msg); + _self.setData({ + isHidePageLoading: true + }) + }, function () { + wx.hideLoading(); + }) + }, + chooseOne(event) { + var index = event.currentTarget.dataset.index + var _self = this; + this.setData({ + currentIndex: index, + categorySeconList: _self.data.categoryOneList[index].subList + }) + }, + goList(e) { + var id = e.currentTarget.dataset.id + wx.navigateTo({ + url: '/subpages/goodslist/goodslist?id=' + id, + }) + } +}) \ No newline at end of file diff --git a/pages/shop/shopcategory.json b/pages/shop/shopcategory.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/pages/shop/shopcategory.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/shop/shopcategory.wxml b/pages/shop/shopcategory.wxml new file mode 100644 index 0000000..e6eddb5 --- /dev/null +++ b/pages/shop/shopcategory.wxml @@ -0,0 +1,27 @@ + + + + + {{item.name}} + + + + + + {{item.name}} + > + + + + + {{it.name}} + + + + + 暂无数据 + + + + + \ No newline at end of file diff --git a/pages/shop/shopcategory.wxss b/pages/shop/shopcategory.wxss new file mode 100644 index 0000000..d40b742 --- /dev/null +++ b/pages/shop/shopcategory.wxss @@ -0,0 +1,112 @@ +/* pages/shop/shopcat.wxss */ +page { + height: 100%; + background: #f6f6f6; +} + +.container-box { + display: flex; + flex-direction: row; + width: 100%; + height: 100%; +} + +.container-box .left { + display: flex; + flex-direction: column; + width: 35%; + height: 100%; + margin-top: 10rpx; +} + +.category-item-default { + display: flex; + flex-direction: row; + padding: 10rpx 0rpx 5rpx 2rpx; + width: 100%; +} + + + +.category-item-active { + display: flex; + flex-direction: row; + padding: 10rpx 0rpx 5rpx 2rpx; + background: white; + width: 100%; +} + +.category-one-name { + margin-left: 20rpx; + padding: 10rpx 0rpx; + flex: 1; +} + + + + +.line { + background: #e70101; + width: 10rpx; + height: 100%; +} + +.container-box .right { + display: flex; + flex-direction: column; + width: 65%; +} + +.category-card { + margin: 10rpx 10rpx 10rpx 0rpx; + border-radius: 20rpx; + min-height: 300rpx; + background-color: white; + box-shadow: 5rpx 5rpx 5rpx 5rpx rgba(0, 0, 0, 0, 1); + padding: 10rpx; +} + +.category-two-name { + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + padding: 10rpx; +} + +.category-thrid-box { + display: flex; + flex-direction: row; + margin-top: 20rpx; + justify-content: flex-start; + align-items: center; +} + +.category-thrid-item { + width: 33%; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + font-size: 30rpx; +} + +.category-thrid-item image { + width: 96rpx; + height: 96rpx; +} + +.category-empty { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + text-align: center; + align-self: center; + font-size: 30rpx; +} + +.category-empty image { + width: 96rpx; + height: 66rpx; +} \ No newline at end of file diff --git a/project.private.config.json b/project.private.config.json new file mode 100644 index 0000000..76b974f --- /dev/null +++ b/project.private.config.json @@ -0,0 +1,4 @@ +{ + "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html", + "libVersion": "2.30.0" +} \ No newline at end of file diff --git a/subpages/goodslist/goodslist.js b/subpages/goodslist/goodslist.js new file mode 100644 index 0000000..ee5b782 --- /dev/null +++ b/subpages/goodslist/goodslist.js @@ -0,0 +1,73 @@ +// pages/goodslist/goodslist.js +var app = getApp(); +Page({ + + /** + * 页面的初始数据 + */ + data: { + id: "" + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + this.setData({ + id: options.id, + page: 1, + rows: 10, + keywords: "", + goodsList: [], + imgUrl: app.shopImgUrl, + hidePageLoading: false + }) + this.getGoodsList(); + }, + getGoodsList() { + var _self = this + var info = { + 'page': _self.data.page, + 'rows': _self.data.rows, + 'categoryId': _self.data.id, + 'keywords': _self.data.keywords + }; + app.restAjax.get(app.restAjax.path('{shopUrl}/app/shopgoods/solrrelease', [app.shopUrl]), info, null, function (code, data) { + if (data.rows.length == 0) { + app.dialog.msg('暂无数据'); + return; + } + _self.setData({ + goodsList: _self.data.goodsList.concat(data.rows), + hidePageLoading: true + }) + console.log(_self.data.goodsList) + wx.stopPullDownRefresh() + }, function (code, data) { + app.dialog.msg(data.msg); + wx.stopPullDownRefresh() + _self.setData({ + hidePageLoading: true + }) + }, function () { + wx.hideLoading(); + wx.stopPullDownRefresh() + }) + }, + //下拉刷新 + onPullDownRefresh() { + this.setData({ + page: 1, + goodsList: [] + }) + this.getGoodsList() + }, + //加载更多 + onReachBottom() { + var _self = this; + _self.setData({ + page: _self.data.page += 1 + }) + _self.getGoodsList() + } +}) \ No newline at end of file diff --git a/subpages/goodslist/goodslist.json b/subpages/goodslist/goodslist.json new file mode 100644 index 0000000..2f12723 --- /dev/null +++ b/subpages/goodslist/goodslist.json @@ -0,0 +1,8 @@ +{ + "usingComponents": {}, + "navigationBarTitleText": "商品", + "enablePullDownRefresh": true, + "backgroundColor": "#efefef", + "backgroundTextStyle": "dark", + "onReachBottomDistance": 150 +} \ No newline at end of file diff --git a/subpages/goodslist/goodslist.wxml b/subpages/goodslist/goodslist.wxml new file mode 100644 index 0000000..c681407 --- /dev/null +++ b/subpages/goodslist/goodslist.wxml @@ -0,0 +1,26 @@ + + + + + 搜索 + + + + + + {{item.goodsName}} + ¥ {{item.goodsPrice}} + + 销量:{{item.goodsSalesVolume}} + 评分:{{item.goodStar}} + {{item.goodsNotFreight ==1 ? '不包邮':'包邮'}} + + + {{item.shopName}} + + + + + + + \ No newline at end of file diff --git a/subpages/goodslist/goodslist.wxss b/subpages/goodslist/goodslist.wxss new file mode 100644 index 0000000..4323fd5 --- /dev/null +++ b/subpages/goodslist/goodslist.wxss @@ -0,0 +1,96 @@ +/* pages/goodslist/goodslist.wxss */ +.search-box { + position: fixed; + top: 0; + left: 0; + width: 100%; + padding: 20rpx 15rpx; + display: flex; + flex-direction: row; + background: #ffffff; +} + +.search-box input { + padding: 10rpx; + background: #f2f2f2; + border-radius: 20rpx; + width: 80%; + font-size: 28rpx; +} + +.search-box .btn { + padding: 10rpx; + color: black; +} + +.container-box { + margin-top: 110rpx; +} + +.goods-item { + display: flex; + flex-direction: row; + margin: 20rpx; +} + +.goods-content { + display: flex; + flex-direction: column; + justify-content: center; + align-items: flex-start; + padding: 0rpx 10rpx; +} + +.goods-name { + font-size: 28rpx; + color: #000000; + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; +} + +.goods-price { + font-size: 40rpx; + color: #e70606; + margin-top: 20rpx; +} + +.goods-type { + display: flex; + flex-direction: row; + margin-top: 10rpx; + +} + +.type-item { + background: #f2f2f2; + color: #e70606; + padding: 10rpx; + font-size: 20rpx; +} + +.type-item:nth-of-type(n+2) { + margin-left: 20rpx; +} + +.shop-name { + display: flex; + flex-direction: row; + justify-content: flex-start; + align-items: center; + font-size: 28rpx; + color: #5a5a5a; + margin-top: 20rpx; +} + +.shop-name .shop-icon { + width: 30rpx; + height: 30rpx; +} + +.goods-item image { + width: 240rpx; + height: 200rpx; +} \ No newline at end of file diff --git a/utils/restAjax.js b/utils/restAjax.js index 90eab16..80afdde 100644 --- a/utils/restAjax.js +++ b/utils/restAjax.js @@ -225,4 +225,5 @@ module.exports.params = getParamsArg; module.exports.path = buildPath; module.exports.escape = escape; module.exports.file = postFile; -module.exports.baseUrl='http://49.233.36.36:58099/xzszwhy'; \ No newline at end of file +module.exports.baseUrl='http://v3.xzszwhy.cn/xzszwhy'; +module.exports.url="http://v3.xzszwhy.cn/" \ No newline at end of file