diff --git a/app.json b/app.json index 8a297d8..9c313fa 100644 --- a/app.json +++ b/app.json @@ -28,23 +28,35 @@ "pages/mine/product/productmanage/searchproduct", "pages/mine/order/ordersuccess", "pages/mine/order/orderlist", - "pages/mine/order/orderdetail" + "pages/mine/order/orderdetail", + "pages/mine/columnlist/columnlist" + ], + "subPackages": [ + { + "root": "packagecard", + "pages": [ + "cardList/cardList", + "cardDetail/cardDetail", + "moments/publish/momentpublish", + "moments/edit/momentedit", + "moments/list/momentslist", + "moments/publish/momentpublishline", + "sharePage/sharePage", + "moments/list/momentsshowlist", + "moments/momentsdetail/momentsdetail", + "moments/showlist/showlist", + "shop/catalog/bannerlist/bannerlist", + "shop/catalog/column/column", + "shop/catalog/list/list", + "shop/shopingcart/cart", + "shop/product/product", + "shop/bespeak/bespeak", + "shop/product/goodsdetail", + "shop/product/affirmorder", + "shop/catalog/bannerlist/goodscataloglist" + ] + } ], - "subPackages": [{ - "root": "packagecard", - "pages": [ - "cardList/cardList", - "cardDetail/cardDetail", - "moments/publish/momentpublish", - "moments/edit/momentedit", - "moments/list/momentslist", - "moments/publish/momentpublishline", - "sharePage/sharePage", - "moments/list/momentsshowlist", - "moments/momentsdetail/momentsdetail", - "moments/showlist/showlist" - ] - }], "window": { "backgroundTextStyle": "dark", "navigationBarBackgroundColor": "#fff", @@ -56,12 +68,14 @@ "color": "#8F8F8F", "selectedColor": "#1296db", "borderStyle": "black", - "list": [{ + "list": [ + { "text": "首页", "pagePath": "pages/index/index", "iconPath": "images/ic_card_normal.png", "selectedIconPath": "images/ic_card_sel.png" - }, { + }, + { "text": "服务", "pagePath": "pages/serve/index/index", "iconPath": "images/ic_serve_normal.png", diff --git a/components/loadmore/index.js b/components/loadmore/index.js new file mode 100644 index 0000000..f7dc2e7 --- /dev/null +++ b/components/loadmore/index.js @@ -0,0 +1,35 @@ +Component({ + properties: { + mtype:{ + type:Number, + value:1, + observer: function (newVal, oldVal) { + this.setData({ + mtype: newVal + }) + } + }, + nodata_str:{ + type:String, + value:'暂无数据', + observer: function (newVal, oldVal) { + this.setData({ + nodata_str: newVal + }) + } + }, + hidden:{ + type:Boolean, + value:true, + observer: function (newVal, oldVal) { + this.setData({ + hidden: newVal + }) + } + }, + tipcolor:{ + type:String, + value:"#f9f9f9" + } + } +}) \ No newline at end of file diff --git a/components/loadmore/index.json b/components/loadmore/index.json new file mode 100644 index 0000000..32640e0 --- /dev/null +++ b/components/loadmore/index.json @@ -0,0 +1,3 @@ +{ + "component": true +} \ No newline at end of file diff --git a/components/loadmore/index.wxml b/components/loadmore/index.wxml new file mode 100644 index 0000000..54e506c --- /dev/null +++ b/components/loadmore/index.wxml @@ -0,0 +1,21 @@ + + + + + + + + + + + + diff --git a/components/loadmore/index.wxss b/components/loadmore/index.wxss new file mode 100644 index 0000000..3925aa7 --- /dev/null +++ b/components/loadmore/index.wxss @@ -0,0 +1,57 @@ +.zan-loadmore{ + position:relative; + width:65%; + margin:0 auto; + line-height:20px; + font-size:14px; + text-align:center; + display: block; + vertical-align: middle +} +.zan-loading{ + width:20px; + height:20px; + display:inline-block; + vertical-align:middle; + animation:weuiLoading 1s steps(12,end) infinite; +} +.zan-loadmore .zan-loading{ + margin-right:4px +} +.zan-loadmore__tips{ + display:inline-block; + vertical-align:middle; + height:20px; + line-height:20px; + color:#999 +} +.zan-loadmore--nodata,.zan-loadmore--nomore{ + border-top:1rpx solid #e5e5e5; +} +.zan-loadmore--nodata{ + margin-top:20rpx +} +.zan-loadmore--nodata .zan-loadmore__tips{ + position:relative; + top:-11px; + padding:0 6px +} +.zan-loadmore--nomore .zan-loadmore__tips{ + position:relative; + top:-11px; + padding:0 6px +} +.zan-loadmore__dot{ + position:absolute; + left:50%; + top:10px; + margin-left:-2px; + margin-top:-2px; + content:" "; + width:4px; + height:4px; + border-radius:50%; + background-color:#e5e5e5; + display:inline-block; + vertical-align:middle; +} \ No newline at end of file diff --git a/packagecard/pages/cardDetail/cardDetail.js b/packagecard/pages/cardDetail/cardDetail.js deleted file mode 100644 index 480269a..0000000 --- a/packagecard/pages/cardDetail/cardDetail.js +++ /dev/null @@ -1,66 +0,0 @@ -// packagecard/pages/cardDetail/cardDetail.js -Page({ - - /** - * 页面的初始数据 - */ - data: { - - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow: function () { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function () { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function () { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function () { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function () { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - - } -}) \ No newline at end of file diff --git a/packagecard/pages/cardDetail/cardDetail.wxml b/packagecard/pages/cardDetail/cardDetail.wxml deleted file mode 100644 index 01a893f..0000000 --- a/packagecard/pages/cardDetail/cardDetail.wxml +++ /dev/null @@ -1,2 +0,0 @@ - -packagecard/pages/cardDetail/cardDetail.wxml diff --git a/packagecard/pages/cardDetail/cardDetail.wxss b/packagecard/pages/cardDetail/cardDetail.wxss deleted file mode 100644 index cd13f9b..0000000 --- a/packagecard/pages/cardDetail/cardDetail.wxss +++ /dev/null @@ -1 +0,0 @@ -/* packagecard/pages/cardDetail/cardDetail.wxss */ \ No newline at end of file diff --git a/packagecard/pages/cardList/cardList.js b/packagecard/pages/cardList/cardList.js deleted file mode 100644 index 6072872..0000000 --- a/packagecard/pages/cardList/cardList.js +++ /dev/null @@ -1,66 +0,0 @@ -// packagecard/pages/cardList/cardList.js -Page({ - - /** - * 页面的初始数据 - */ - data: { - - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow: function () { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function () { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function () { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function () { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function () { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - - } -}) \ No newline at end of file diff --git a/packagecard/pages/cardList/cardList.wxml b/packagecard/pages/cardList/cardList.wxml deleted file mode 100644 index 971cb1d..0000000 --- a/packagecard/pages/cardList/cardList.wxml +++ /dev/null @@ -1,2 +0,0 @@ - -packagecard/pages/cardList/cardList.wxml diff --git a/packagecard/pages/cardList/cardList.wxss b/packagecard/pages/cardList/cardList.wxss deleted file mode 100644 index 661fde8..0000000 --- a/packagecard/pages/cardList/cardList.wxss +++ /dev/null @@ -1 +0,0 @@ -/* packagecard/pages/cardList/cardList.wxss */ \ No newline at end of file diff --git a/packagecard/pages/moments/edit/momentedit.js b/packagecard/pages/moments/edit/momentedit.js deleted file mode 100644 index e6fed8b..0000000 --- a/packagecard/pages/moments/edit/momentedit.js +++ /dev/null @@ -1,66 +0,0 @@ -// packagecard/pages/moments/edit/momentedit.js -Page({ - - /** - * 页面的初始数据 - */ - data: { - - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow: function () { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function () { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function () { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function () { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function () { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - - } -}) \ No newline at end of file diff --git a/packagecard/pages/moments/edit/momentedit.wxml b/packagecard/pages/moments/edit/momentedit.wxml deleted file mode 100644 index 8b40299..0000000 --- a/packagecard/pages/moments/edit/momentedit.wxml +++ /dev/null @@ -1,2 +0,0 @@ - -packagecard/pages/moments/edit/momentedit.wxml diff --git a/packagecard/pages/moments/edit/momentedit.wxss b/packagecard/pages/moments/edit/momentedit.wxss deleted file mode 100644 index 93295c6..0000000 --- a/packagecard/pages/moments/edit/momentedit.wxss +++ /dev/null @@ -1 +0,0 @@ -/* packagecard/pages/moments/edit/momentedit.wxss */ \ No newline at end of file diff --git a/packagecard/pages/moments/list/momentslist.js b/packagecard/pages/moments/list/momentslist.js deleted file mode 100644 index 5f7d7f3..0000000 --- a/packagecard/pages/moments/list/momentslist.js +++ /dev/null @@ -1,66 +0,0 @@ -// packagecard/pages/moments/list/momentslist.js -Page({ - - /** - * 页面的初始数据 - */ - data: { - - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow: function () { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function () { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function () { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function () { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function () { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - - } -}) \ No newline at end of file diff --git a/packagecard/pages/moments/list/momentslist.wxml b/packagecard/pages/moments/list/momentslist.wxml deleted file mode 100644 index 9fc2489..0000000 --- a/packagecard/pages/moments/list/momentslist.wxml +++ /dev/null @@ -1,2 +0,0 @@ - -packagecard/pages/moments/list/momentslist.wxml diff --git a/packagecard/pages/moments/list/momentslist.wxss b/packagecard/pages/moments/list/momentslist.wxss deleted file mode 100644 index be1841f..0000000 --- a/packagecard/pages/moments/list/momentslist.wxss +++ /dev/null @@ -1 +0,0 @@ -/* packagecard/pages/moments/list/momentslist.wxss */ \ No newline at end of file diff --git a/packagecard/pages/moments/list/momentsshowlist.js b/packagecard/pages/moments/list/momentsshowlist.js deleted file mode 100644 index 9085815..0000000 --- a/packagecard/pages/moments/list/momentsshowlist.js +++ /dev/null @@ -1,66 +0,0 @@ -// packagecard/pages/moments/list/momentsshowlist.js -Page({ - - /** - * 页面的初始数据 - */ - data: { - - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow: function () { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function () { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function () { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function () { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function () { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - - } -}) \ No newline at end of file diff --git a/packagecard/pages/moments/list/momentsshowlist.wxml b/packagecard/pages/moments/list/momentsshowlist.wxml deleted file mode 100644 index 94f6b81..0000000 --- a/packagecard/pages/moments/list/momentsshowlist.wxml +++ /dev/null @@ -1,2 +0,0 @@ - -packagecard/pages/moments/list/momentsshowlist.wxml diff --git a/packagecard/pages/moments/list/momentsshowlist.wxss b/packagecard/pages/moments/list/momentsshowlist.wxss deleted file mode 100644 index 2f9d7a9..0000000 --- a/packagecard/pages/moments/list/momentsshowlist.wxss +++ /dev/null @@ -1 +0,0 @@ -/* packagecard/pages/moments/list/momentsshowlist.wxss */ \ No newline at end of file diff --git a/packagecard/pages/moments/momentsdetail/momentsdetail.js b/packagecard/pages/moments/momentsdetail/momentsdetail.js deleted file mode 100644 index 493fbf7..0000000 --- a/packagecard/pages/moments/momentsdetail/momentsdetail.js +++ /dev/null @@ -1,66 +0,0 @@ -// packagecard/pages/moments/momentsdetail/momentsdetail.js -Page({ - - /** - * 页面的初始数据 - */ - data: { - - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow: function () { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function () { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function () { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function () { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function () { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - - } -}) \ No newline at end of file diff --git a/packagecard/pages/moments/momentsdetail/momentsdetail.wxml b/packagecard/pages/moments/momentsdetail/momentsdetail.wxml deleted file mode 100644 index 5a18c0e..0000000 --- a/packagecard/pages/moments/momentsdetail/momentsdetail.wxml +++ /dev/null @@ -1,2 +0,0 @@ - -packagecard/pages/moments/momentsdetail/momentsdetail.wxml diff --git a/packagecard/pages/moments/momentsdetail/momentsdetail.wxss b/packagecard/pages/moments/momentsdetail/momentsdetail.wxss deleted file mode 100644 index fe25e94..0000000 --- a/packagecard/pages/moments/momentsdetail/momentsdetail.wxss +++ /dev/null @@ -1 +0,0 @@ -/* packagecard/pages/moments/momentsdetail/momentsdetail.wxss */ \ No newline at end of file diff --git a/packagecard/pages/moments/publish/momentpublish.js b/packagecard/pages/moments/publish/momentpublish.js deleted file mode 100644 index 3fd61a9..0000000 --- a/packagecard/pages/moments/publish/momentpublish.js +++ /dev/null @@ -1,66 +0,0 @@ -// packagecard/pages/moments/publish/momentpublish.js -Page({ - - /** - * 页面的初始数据 - */ - data: { - - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow: function () { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function () { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function () { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function () { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function () { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - - } -}) \ No newline at end of file diff --git a/packagecard/pages/moments/publish/momentpublish.json b/packagecard/pages/moments/publish/momentpublish.json deleted file mode 100644 index 8835af0..0000000 --- a/packagecard/pages/moments/publish/momentpublish.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "usingComponents": {} -} \ No newline at end of file diff --git a/packagecard/pages/moments/publish/momentpublish.wxml b/packagecard/pages/moments/publish/momentpublish.wxml deleted file mode 100644 index f4d2a50..0000000 --- a/packagecard/pages/moments/publish/momentpublish.wxml +++ /dev/null @@ -1,2 +0,0 @@ - -packagecard/pages/moments/publish/momentpublish.wxml diff --git a/packagecard/pages/moments/publish/momentpublish.wxss b/packagecard/pages/moments/publish/momentpublish.wxss deleted file mode 100644 index d0532f4..0000000 --- a/packagecard/pages/moments/publish/momentpublish.wxss +++ /dev/null @@ -1 +0,0 @@ -/* packagecard/pages/moments/publish/momentpublish.wxss */ \ No newline at end of file diff --git a/packagecard/pages/moments/publish/momentpublishline.js b/packagecard/pages/moments/publish/momentpublishline.js deleted file mode 100644 index 51b325b..0000000 --- a/packagecard/pages/moments/publish/momentpublishline.js +++ /dev/null @@ -1,66 +0,0 @@ -// packagecard/pages/moments/publish/momentpublishline.js -Page({ - - /** - * 页面的初始数据 - */ - data: { - - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow: function () { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function () { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function () { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function () { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function () { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - - } -}) \ No newline at end of file diff --git a/packagecard/pages/moments/publish/momentpublishline.json b/packagecard/pages/moments/publish/momentpublishline.json deleted file mode 100644 index 8835af0..0000000 --- a/packagecard/pages/moments/publish/momentpublishline.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "usingComponents": {} -} \ No newline at end of file diff --git a/packagecard/pages/moments/publish/momentpublishline.wxml b/packagecard/pages/moments/publish/momentpublishline.wxml deleted file mode 100644 index d1f1766..0000000 --- a/packagecard/pages/moments/publish/momentpublishline.wxml +++ /dev/null @@ -1,2 +0,0 @@ - -packagecard/pages/moments/publish/momentpublishline.wxml diff --git a/packagecard/pages/moments/publish/momentpublishline.wxss b/packagecard/pages/moments/publish/momentpublishline.wxss deleted file mode 100644 index ace5ebd..0000000 --- a/packagecard/pages/moments/publish/momentpublishline.wxss +++ /dev/null @@ -1 +0,0 @@ -/* packagecard/pages/moments/publish/momentpublishline.wxss */ \ No newline at end of file diff --git a/packagecard/pages/moments/showlist/showlist.js b/packagecard/pages/moments/showlist/showlist.js deleted file mode 100644 index 821ebc6..0000000 --- a/packagecard/pages/moments/showlist/showlist.js +++ /dev/null @@ -1,66 +0,0 @@ -// packagecard/pages/moments/showlist/showlist.js -Page({ - - /** - * 页面的初始数据 - */ - data: { - - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow: function () { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function () { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function () { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function () { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function () { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - - } -}) \ No newline at end of file diff --git a/packagecard/pages/moments/showlist/showlist.json b/packagecard/pages/moments/showlist/showlist.json deleted file mode 100644 index 8835af0..0000000 --- a/packagecard/pages/moments/showlist/showlist.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "usingComponents": {} -} \ No newline at end of file diff --git a/packagecard/pages/moments/showlist/showlist.wxml b/packagecard/pages/moments/showlist/showlist.wxml deleted file mode 100644 index 4c6fefc..0000000 --- a/packagecard/pages/moments/showlist/showlist.wxml +++ /dev/null @@ -1,2 +0,0 @@ - -packagecard/pages/moments/showlist/showlist.wxml diff --git a/packagecard/pages/moments/showlist/showlist.wxss b/packagecard/pages/moments/showlist/showlist.wxss deleted file mode 100644 index d69b080..0000000 --- a/packagecard/pages/moments/showlist/showlist.wxss +++ /dev/null @@ -1 +0,0 @@ -/* packagecard/pages/moments/showlist/showlist.wxss */ \ No newline at end of file diff --git a/packagecard/pages/sharePage/sharePage.js b/packagecard/pages/sharePage/sharePage.js deleted file mode 100644 index 37a79e6..0000000 --- a/packagecard/pages/sharePage/sharePage.js +++ /dev/null @@ -1,66 +0,0 @@ -// packagecard/pages/sharePage/sharePage.js -Page({ - - /** - * 页面的初始数据 - */ - data: { - - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow: function () { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function () { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function () { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function () { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function () { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - - } -}) \ No newline at end of file diff --git a/packagecard/pages/sharePage/sharePage.json b/packagecard/pages/sharePage/sharePage.json deleted file mode 100644 index 8835af0..0000000 --- a/packagecard/pages/sharePage/sharePage.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "usingComponents": {} -} \ No newline at end of file diff --git a/packagecard/pages/sharePage/sharePage.wxml b/packagecard/pages/sharePage/sharePage.wxml deleted file mode 100644 index 0825e0b..0000000 --- a/packagecard/pages/sharePage/sharePage.wxml +++ /dev/null @@ -1,2 +0,0 @@ - -packagecard/pages/sharePage/sharePage.wxml diff --git a/packagecard/pages/sharePage/sharePage.wxss b/packagecard/pages/sharePage/sharePage.wxss deleted file mode 100644 index cd21f4a..0000000 --- a/packagecard/pages/sharePage/sharePage.wxss +++ /dev/null @@ -1 +0,0 @@ -/* packagecard/pages/sharePage/sharePage.wxss */ \ No newline at end of file diff --git a/packagecard/shop/bespeak/bespeak.js b/packagecard/shop/bespeak/bespeak.js new file mode 100644 index 0000000..424e4eb --- /dev/null +++ b/packagecard/shop/bespeak/bespeak.js @@ -0,0 +1,205 @@ +// pages/shop/bespeak/bespeak.js +const app = getApp(); +Page({ + + /** + * 页面的初始数据 + */ + data: { + shopId: '', + shopBean: null, + active: 1, + testGoods: { + name: "商品" + }, + goodsList: [], + shopCart: [], + tabList: [], + TabCur: 0, + scrollLeft: 0, + swiperlist: [], + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + this.setData({ + shopId: options.shopId, + }) + this.getShopDetail() + this.getShopGoodsCatalog() + this.getShopGoodsList() + }, + getShopDetail() { + let _self = this + wx.showLoading({ + title: '加载中...', + }) + app.restAjax.get(app.restAjax.path(app.apis.getShopDetail, [app.baseUrls.tradeUrl, _self.data.shopId]), {}, { + headers: { + token: app.globalData.token + } + }, function (code, data) { + wx.hideLoading({}) + if (code == 200) { + console.log(data) + _self.setData({ + shopBean: data + }) + } + }, function (code, data) { + wx.hideLoading({}) + if (data.msg) { + wx.showToast({ + title: data.msg, + icon: 'none' + }) + } else { + wx.showToast({ + title: '网络错误', + icon: 'error' + }) + } + }); + }, + //获取店铺所有商品类目 + getShopGoodsList() { + let _self = this + wx.showLoading({ + title: '加载中...', + }) + app.restAjax.get( + app.restAjax.path(app.restAjax.apis.getShopGoodsList, [app.restAjax.baseUrl.tradeUrl, _self.data.shopId]), {}, { + headers: { + token: app.globalData.token + } + }, (code, data) => { + wx.hideLoading({}) + if (code == 200) { + if (data.rows.length > 0) { + _self.buildData(data.rows) + } else { + //TODO 没有数据 + } + } + }, (code, error) => { + wx.hideLoading({}) + if (error.msg) { + wx.showToast({ + title: error.msg, + }) + } else { + wx.showToast({ + title: '网络错误', + icon: 'error' + }) + } + }) + }, + //获取商店所有分类 + getShopGoodsCatalog() { + let _self = this + app.restAjax.get(app.restAjax.path(app.restAjax.apis.getShopCatalogList, [app.restAjax.baseUrl.tradeUrl, _self.data.shopId]), {}, { + headers: { + token: app.globalData.token + } + }, (code, data) => { + if (code == 200) { + _self.setData({ + tabList: data + }) + _self.getGoodsListByCategory(_self.data.tabList[0].categoryId) + } + }, (code, error) => { + if (error.msg) { + wx.showToast({ + title: error.msg, + icon: 'none' + }) + } else { + wx.showToast({ + title: '网络错误', + icon: 'error' + }) + } + }) + }, + getGoodsListByCategory(categoryId) { + wx.showLoading({ + title: '加载中', + }) + let _self = this + app.restAjax.get( + app.restAjax.path(app.restAjax.apis.getGoodsByCatalogAndShop, [app.restAjax.baseUrl.tradeUrl, categoryId]), { + page: 1, + shopId: _self.data.shopId + }, { + headers: { + token: app.globalData.token + } + }, (code, data) => { + wx.hideLoading({}) + if (code == 200) { + if (data.rows.length > 0) { + data.rows.forEach(it => { + var picId = it.goodsPhotos.substring(0, it.goodsPhotos.indexOf(',') != -1 ? it.goodsPhotos.indexOf(',') : it.goodsPhotos.length) + it.hotPic = app.restAjax.baseUrl.tradeUrl + app.restAjax.baseUrl.baseImgUrl + picId + }) + _self.data.goodsList = _self.data.goodsList.concat(data.rows) + _self.setData({ + goodsList: _self.data.goodsList + }) + } + } + }, (code, error) => { + wx.hideLoading({}) + if (error.msg) { + wx.showToast({ + title: error.msg, + icon: 'none' + }) + } else { + wx.showToast({ + title: '网络错误', + icon: 'error' + }) + } + }) + }, + //构建热梦商品 + buildData(datas) { + let _self = this + datas.forEach(it => { + var picId = it.goodsPhotos.substring(0, it.goodsPhotos.indexOf(',') != -1 ? it.goodsPhotos.indexOf(',') : it.goodsPhotos.length) + it.hotPic = app.restAjax.baseUrl.tradeUrl + app.restAjax.baseUrl.baseImgUrl + picId + _self.data.swiperlist.push(it) + }) + _self.setData({ + swiperlist: _self.data.swiperlist + }) + }, + tabSelect(e) { + this.setData({ + goodsList: [], + TabCur: e.currentTarget.dataset.id, + scrollLeft: (e.currentTarget.dataset.id - 1) * 60 + }) + var cItem = this.data.tabList[this.data.TabCur] + this.getGoodsListByCategory(cItem.categoryId) + }, + callPhone() {}, + //商品分类页面 + showCategoryGoods() { + var item = this.data.tabList[this.data.TabCur] + wx.navigateTo({ + url: '../catalog/bannerlist/goodscataloglist?shopId=' + this.data.shopId + '&catalogId=' + item.categoryId, + }) + }, + //商品详情页面 + toGoodsDetail(e) { + let _self = this + wx.navigateTo({ + url: '../product/goodsdetail?shopId=' + _self.data.shopId + '&goodsId=' + e.currentTarget.dataset.item.goodsId, + }) + }, +}) \ No newline at end of file diff --git a/packagecard/shop/bespeak/bespeak.json b/packagecard/shop/bespeak/bespeak.json new file mode 100644 index 0000000..b55b5a2 --- /dev/null +++ b/packagecard/shop/bespeak/bespeak.json @@ -0,0 +1,4 @@ +{ + "usingComponents": { + } +} \ No newline at end of file diff --git a/packagecard/shop/bespeak/bespeak.wxml b/packagecard/shop/bespeak/bespeak.wxml new file mode 100644 index 0000000..56bb38f --- /dev/null +++ b/packagecard/shop/bespeak/bespeak.wxml @@ -0,0 +1,82 @@ + + + 服务 + + + + + + + + + + + + + + + + + + {{shopBean.shopName}} + + + {{shopBean.shopSummary}} + + + + + + + + + + {{shopBean.shopAddress}} + + + + + + + + 精选商品 + + + + + {{item.categoryName}} + + + + 更多 > + + + + + + + + + {{item.goodsName}} + + + + \ No newline at end of file diff --git a/packagecard/shop/bespeak/bespeak.wxss b/packagecard/shop/bespeak/bespeak.wxss new file mode 100644 index 0000000..3f97deb --- /dev/null +++ b/packagecard/shop/bespeak/bespeak.wxss @@ -0,0 +1,19 @@ +.test { + display: flex; + flex-direction: row; + flex-wrap: nowrap; + margin-bottom: 80rpx; + justify-content: flex-start; + align-items: center; +} + +.scroll-content { + position: absolute; + width: 100%; + top: 470rpx; + border-top-right-radius: 60rpx; + border-top-left-radius: 60rpx; + padding-top: 20rpx; + z-index: 30; + background-color: white; +} \ No newline at end of file diff --git a/packagecard/shop/catalog/bannerlist/bannerlist.js b/packagecard/shop/catalog/bannerlist/bannerlist.js new file mode 100644 index 0000000..532260f --- /dev/null +++ b/packagecard/shop/catalog/bannerlist/bannerlist.js @@ -0,0 +1,358 @@ +// pages/shop/catalog/bannerlist/bannerlist.js +const app = getApp() +Page({ + + /** + * 页面的初始数据 + */ + data: { + shopId: '', + active: 1, + swiperlist: [], + typeMenu: [], + goodsList: [], + currentPage: 1, + contentHeight: app.globalData.windowHeight, + isLoadMore: false, //是否在加载中 + hasMore: true, //是否还有更多数据 + currentPage: 1, + totalSize: 0, + baseImg: app.restAjax.baseUrl.tradeUrl + app.restAjax.baseUrl.baseImgUrl, + isShowCart: false, + shopCart: [] + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + this.setData({ + shopId: options.shopId, + shopCart: app.globalData.shopCart + }) + //获取热门商品 + this.getShopGoodsList(this.data.shopId) + //获取店铺类别 + this.getShopGoodsCatalog(this.data.shopId) + //获取全部商品 + this.getShopGoodsListByPage(this.data.shopId) + this.selectComponent('#sCart').refreshCart() + }, + //获取店铺所有商品类目 + getShopGoodsList(shopId) { + let _self = this + wx.showLoading({ + title: '加载中...', + }) + app.restAjax.get( + app.restAjax.path(app.restAjax.apis.getShopGoodsList, [app.restAjax.baseUrl.tradeUrl, shopId]), {}, { + headers: { + token: app.globalData.token + } + }, (code, data) => { + wx.hideLoading({}) + _self.setData({ + isRefreshing: false + }) + if (code == 200) { + if (data.rows.length > 0) { + _self.buildData(data.rows) + } else { + //TODO 没有数据 + } + } + }, (code, error) => { + wx.hideLoading({}) + if (error.msg) { + app.dialog.msg(error.msg) + } else { + wx.showToast({ + title: '网络错误', + icon: 'error' + }) + } + }) + }, + //构建热梦商品 + buildData(datas) { + let _self = this + datas.forEach(it => { + var picId = it.goodsPhotos.substring(0, it.goodsPhotos.indexOf(',') != -1 ? it.goodsPhotos.indexOf(',') : it.goodsPhotos.length) + it.hotPic = app.restAjax.baseUrl.tradeUrl + app.restAjax.baseUrl.baseImgUrl + picId + _self.data.swiperlist.push(it) + }) + _self.setData({ + swiperlist: _self.data.swiperlist + }) + }, + //显示热门商品详情 + showHot(e) { + let _self = this + wx.navigateTo({ + url: '../../product/goodsdetail?shopId=' + _self.data.shopId + '&goodsId=' + e.currentTarget.dataset.item.goodsId, + }) + }, + //获取商店所有分类 + getShopGoodsCatalog(shopId) { + let _self = this + app.restAjax.get(app.restAjax.path(app.restAjax.apis.getShopCatalogList, [app.restAjax.baseUrl.tradeUrl, shopId]), {}, { + headers: { + token: app.globalData.token + } + }, (code, data) => { + if (code == 200) { + _self.setData({ + typeMenu: data + }) + } + }, (code, error) => { + if (error.msg) { + app.dialog.msg(error.msg) + } else { + wx.showToast({ + title: '网络错误', + icon: 'error' + }) + } + }) + }, + //分页获取商品 + getShopGoodsListByPage(id) { + let _self = this + app.restAjax.get( + app.restAjax.path(app.restAjax.apis.getShopGoodsList, [app.restAjax.baseUrl.tradeUrl, id]), { + page: _self.data.currentPage + }, { + headers: { + token: app.globalData.token + } + }, (code, data) => { + _self.setData({ + isLoadMore: false + }) + if (code == 200) { + if (data.rows.length > 0) { + data.rows.forEach(it => { + it.buyNum = 0 + }) + data.rows.forEach(it => { + //判断购物车是否存在该商品 + if (app.globalData.shopCart.length > 0) { + app.globalData.shopCart.forEach(i => { + if (i.goodsId == it.goodsId) { + it.buyNum = i.buyNum + } + }) + } + }) + _self.data.goodsList = _self.data.goodsList.concat(data.rows) + _self.setData({ + goodsList: _self.data.goodsList + }) + } else { + _self.setData({ + hasMore: false + }) + } + } + }, (code, error) => { + wx.hideLoading({}) + if (error.msg) { + app.dialog.msg(error.msg) + } else { + wx.showToast({ + title: '网络错误', + icon: 'error' + }) + } + }) + }, + doLoadMore(e) { + let _self = this + if (_self.data.hasMore) { + if (_self.data.isLoadMore) { + return + } + _self.setData({ + isLoadMore: true, + currentPage: ++_self.data.currentPage + }) + _self.getShopGoodsListByPage(_self.data.shopId) + } else { + wx.showToast({ + title: '暂无更多数据', + icon: 'none', + duration: 500 + }) + } + }, + //商品详情页面 + toGoodsDetail(e) { + let _self = this + wx.navigateTo({ + url: '../../product/goodsdetail?shopId=' + _self.data.shopId + '&goodsId=' + e.currentTarget.dataset.item.goodsId, + }) + }, + //商品分类页面 + toGoodsCatalogPage(e) { + wx.navigateTo({ + url: './goodscataloglist?shopId=' + this.data.shopId + '&catalogId=' + e.currentTarget.dataset.item.categoryId, + }) + }, + onShow() { + let _self = this + if (app.globalData.shopCart.length > 0) { + _self.data.goodsList.forEach(it => { + var isExist = false + app.globalData.shopCart.forEach(i => { + if (i.goodsId == it.goodsId) { + isExist = true + it.buyNum = i.buyNum + } + }) + if (!isExist) { + it.buyNum = 0 + } + }) + } else { + _self.data.goodsList.forEach(it => { + it.buyNum = 0 + }) + } + this.setData({ + goodsList: _self.data.goodsList, + shopCart: app.globalData.shopCart + }) + this.selectComponent('#sCart').refreshCart() + }, + //列表添加购物车 + addToCart(e) { + let _self = this + let goods = e.currentTarget.dataset.item + _self.data.goodsList.forEach(it => { + if (goods.goodsId == it.goodsId) { + it.buyNum += 1 + if (it.buyNum > goods.goodsTotal) { + it.buyNum = goods.goodsTotal + wx.showToast({ + title: '超出库存', + icon: 'error' + }) + } + } + }) + this.selectComponent('#sCart').listAddToCart(goods) + _self.setData({ + goodsList: _self.data.goodsList, + shopCart: app.globalData.shopCart + }) + }, + removeToCart(e) { + let goods = e.currentTarget.dataset.item + let _self = this + _self.data.goodsList.forEach(it => { + if (goods.goodsId == it.goodsId) { + it.buyNum -= 1 + } + }) + this.selectComponent('#sCart').listRemoveCart(goods) + _self.setData({ + goodsList: _self.data.goodsList, + shopCart: app.globalData.shopCart + }) + }, + //显示购物车弹框 + doShowCart() { + var _self = this + if (this.data.shopCart.length > 0) { + //判断当前购物车是否存在该商店的商品 + var isExist = false + this.data.shopCart.forEach(it => { + if (it.shopId == _self.data.shopId) { + isExist = true + } + }) + if (isExist) { + if (this.data.isShowCart) { + this.setData({ + isShowCart: false + }) + } else { + this.setData({ + isShowCart: true + }) + } + } else { + wx.showToast({ + title: '购物车空空如也', + icon: 'error' + }) + } + } else { + wx.showToast({ + title: '购物车空空如也', + icon: 'error' + }) + } + }, + //隐藏购物车弹框 + onHideCart() { + this.setData({ + isShowCart: false + }) + }, + //删除购物车中的商品 + delGoods(e) { + let _self = this + var index = e.currentTarget.dataset.index + var goods = e.currentTarget.dataset.goods + app.globalData.shopCart.splice(index, 1) + //删除购物车中数据 + _self.selectComponent('#sCart').refreshCart() + //将列表中的数据购买数量重置 + _self.data.goodsList.forEach(it => { + if (it.goodsId == goods.goodsId) { + it.buyNum = 0 + } + }) + _self.setData({ + goodsList: _self.data.goodsList, + shopCart: app.globalData.shopCart + }) + if (_self.data.shopCart.length <= 0) { + _self.setData({ + isShowCart: false + }) + } + }, + //购物车弹框删除或添加商品 + onChange(e) { + let buyNum = e.detail + let goods = e.currentTarget.dataset.goods + let _self = this + //遍历列表 + _self.data.goodsList.forEach(it => { + if (it.goodsId == goods.goodsId) { + it.buyNum = buyNum + } + }) + //遍历购物车 + _self.data.shopCart.forEach(it => { + if (it.goodsId == goods.goodsId) { + it.buyNum = buyNum + } + }) + //刷新视图 + _self.setData({ + goodsList: _self.data.goodsList, + shopCart: _self.data.shopCart + }) + //刷新购物车 + _self.selectComponent('#sCart').refreshCart() + }, + onHide() { + this.setData({ + isShowCart: false + }) + } +}) \ No newline at end of file diff --git a/packagecard/shop/catalog/bannerlist/bannerlist.json b/packagecard/shop/catalog/bannerlist/bannerlist.json new file mode 100644 index 0000000..b55b5a2 --- /dev/null +++ b/packagecard/shop/catalog/bannerlist/bannerlist.json @@ -0,0 +1,4 @@ +{ + "usingComponents": { + } +} \ No newline at end of file diff --git a/packagecard/shop/catalog/bannerlist/bannerlist.wxml b/packagecard/shop/catalog/bannerlist/bannerlist.wxml new file mode 100644 index 0000000..0c47259 --- /dev/null +++ b/packagecard/shop/catalog/bannerlist/bannerlist.wxml @@ -0,0 +1,78 @@ + + + 服务 + + + + + + + + + + + + + + + {{item.categoryName}} + + + + + + 全部商品 + + + + + + + {{item.goodsName}} + + + {{item.goodsSummary}} + + + + ¥{{item.goodsUnitPrice}} + + + + {{item.buyNum}} + + + + + + + + + + + + + + + + + + {{item.goodsName}} + {{item.goodsSummary}} + + ¥{{item.goodsUnitPrice}} + + 删除 + + + + + + + \ No newline at end of file diff --git a/packagecard/shop/catalog/bannerlist/bannerlist.wxss b/packagecard/shop/catalog/bannerlist/bannerlist.wxss new file mode 100644 index 0000000..ee58289 --- /dev/null +++ b/packagecard/shop/catalog/bannerlist/bannerlist.wxss @@ -0,0 +1,9 @@ +/* pages/shop/catalog/bannerlist/bannerlist.wxss */ + +.screen-swiper { + min-height:455rpx; +} +.page { + height: 100Vh; + width: 100vw; +} diff --git a/packagecard/shop/catalog/bannerlist/goodscataloglist.js b/packagecard/shop/catalog/bannerlist/goodscataloglist.js new file mode 100644 index 0000000..ce0c353 --- /dev/null +++ b/packagecard/shop/catalog/bannerlist/goodscataloglist.js @@ -0,0 +1,250 @@ +// pages/shop/catalog/bannerlist/goodscataloglist.js +const app = getApp() +Page({ + + /** + * 页面的初始数据 + */ + data: { + shopId: '', + catalogId: '', + active: 1, + swiperlist: [], + typeMenu: [], + shopCart: [], + isShowCart: false, + goodsList: [], + currentPage: 1, + contentHeight: app.globalData.windowHeight, + isLoadMore: false, //是否在加载中 + hasMore: true, //是否还有更多数据 + currentPage: 1, + totalSize: 0, + baseImg: app.restAjax.baseUrl.tradeUrl + app.restAjax.baseUrl.baseImgUrl + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + this.setData({ + shopId: options.shopId, + catalogId: options.catalogId, + shopCart: app.globalData.shopCart + }) + this.getShopGoodsList(this.data.catalogId) + }, + //根据类目Id获取商店商品 + getShopGoodsList(catalogID) { + let _self = this + app.restAjax.get( + app.restAjax.path(app.restAjax.apis.getGoodsByCatalogAndShop, [app.restAjax.baseUrl.tradeUrl, catalogID]), { + page: _self.data.currentPage, + shopId: _self.data.shopId + }, { + headers: { + token: app.globalData.token + } + }, (code, data) => { + _self.setData({ + isLoadMore: false + }) + if (code == 200) { + if (data.rows.length > 0) { + data.rows.forEach(it => { + //判断购物车是否存在该商品 + if (app.globalData.shopCart.length > 0) { + app.globalData.shopCart.forEach(i => { + if (i.goodsId == it.goodsId) { + it.buyNum = i.buyNum + } else { + it.buyNum = 0 + } + }) + } else { + it.buyNum = 0 + } + }) + _self.data.goodsList = _self.data.goodsList.concat(data.rows) + _self.setData({ + goodsList: _self.data.goodsList + }) + } else { + _self.setData({ + hasMore: false + }) + } + } + }, (code, error) => { + wx.hideLoading({}) + if (error.msg) { + app.dialog.msg(error.msg) + } else { + wx.showToast({ + title: '网络错误', + icon: 'error' + }) + } + }) + }, + doLoadMore(e) { + let _self = this + if (_self.data.hasMore) { + if (_self.data.isLoadMore) { + return + } + _self.setData({ + isLoadMore: true, + currentPage: ++_self.data.currentPage + }) + _self.getShopGoodsList(_self.data.catalogId) + } else { + wx.showToast({ + title: '暂无更多数据', + icon: 'none', + duration: 500 + }) + } + }, + //商品详情页面 + toGoodsDetail(e) { + let _self = this + wx.navigateTo({ + url: '../../product/goodsdetail?shopId=' + _self.data.shopId + '&goodsId=' + e.currentTarget.dataset.item.goodsId, + }) + }, + onShow() { + let _self = this + if (app.globalData.shopCart.length > 0) { + _self.data.goodsList.forEach(it => { + var isExist = false + app.globalData.shopCart.forEach(i => { + if (i.goodsId == it.goodsId) { + isExist = true + it.buyNum = i.buyNum + } + }) + if (!isExist) { + it.buyNum = 0 + } + }) + } else { + _self.data.goodsList.forEach(it => { + it.buyNum = 0 + }) + } + _self.setData({ + goodsList: _self.data.goodsList + }) + if (_self.selectComponent('#sCart')) { + _self.selectComponent('#sCart').refreshCart() + } + }, + //列表添加购物车 + addToCart(e) { + let _self = this + let goods = e.currentTarget.dataset.item + _self.data.goodsList.forEach(it => { + if (goods.goodsId == it.goodsId) { + it.buyNum += 1 + if (it.buyNum > goods.goodsTotal) { + it.buyNum = goods.goodsTotal + wx.showToast({ + title: '超出库存', + icon: 'error' + }) + } + } + }) + _self.setData({ + goodsList: _self.data.goodsList + }) + _self.selectComponent('#sCart').listAddToCart(goods) + }, + removeToCart(e) { + let goods = e.currentTarget.dataset.item + let _self = this + _self.data.goodsList.forEach(it => { + if (goods.goodsId == it.goodsId) { + it.buyNum -= 1 + } + }) + _self.setData({ + goodsList: _self.data.goodsList + }) + this.selectComponent('#sCart').listRemoveCart(goods) + }, + //显示购物车弹框 + doShowCart() { + if (this.data.shopCart.length > 0) { + this.setData({ + isShowCart: true + }) + } else { + wx.showToast({ + title: '购物车空空如也', + icon: 'error' + }) + } + }, + //隐藏购物车弹框 + onHideCart() { + this.setData({ + isShowCart: false + }) + }, + //删除购物车中的商品 + delGoods(e) { + let _self = this + var index = e.currentTarget.dataset.index + var goods = e.currentTarget.dataset.goods + app.globalData.shopCart.splice(index, 1) + //删除购物车中数据 + _self.selectComponent('#sCart').refreshCart() + //将列表中的数据购买数量重置 + _self.data.goodsList.forEach(it => { + if (it.goodsId == goods.goodsId) { + it.buyNum = 0 + } + }) + _self.setData({ + goodsList: _self.data.goodsList, + shopCart: app.globalData.shopCart + }) + if (_self.data.shopCart.length <= 0) { + _self.setData({ + isShowCart: false + }) + } + }, + //购物车弹框删除或添加商品 + onChange(e) { + let buyNum = e.detail + let goods = e.currentTarget.dataset.goods + let _self = this + //遍历列表 + _self.data.goodsList.forEach(it => { + if (it.goodsId == goods.goodsId) { + it.buyNum = buyNum + } + }) + //遍历购物车 + _self.data.shopCart.forEach(it => { + if (it.goodsId == goods.goodsId) { + it.buyNum = buyNum + } + }) + //刷新视图 + _self.setData({ + goodsList: _self.data.goodsList, + shopCart: _self.data.shopCart + }) + //刷新购物车 + _self.selectComponent('#sCart').refreshCart() + }, + onHide() { + this.setData({ + isShowCart: false + }) + } +}) \ No newline at end of file diff --git a/packagecard/pages/cardDetail/cardDetail.json b/packagecard/shop/catalog/bannerlist/goodscataloglist.json similarity index 100% rename from packagecard/pages/cardDetail/cardDetail.json rename to packagecard/shop/catalog/bannerlist/goodscataloglist.json diff --git a/packagecard/shop/catalog/bannerlist/goodscataloglist.wxml b/packagecard/shop/catalog/bannerlist/goodscataloglist.wxml new file mode 100644 index 0000000..f96e27c --- /dev/null +++ b/packagecard/shop/catalog/bannerlist/goodscataloglist.wxml @@ -0,0 +1,64 @@ + + + 服务 + + + + + + + + + {{item.goodsName}} + + + {{item.goodsSummary}} + + + + + ¥{{item.goodsUnitPrice}} + + + + {{item.buyNum}} + + + + + + + + + + + + + + + + + + + + + {{item.goodsName}} + {{item.goodsSummary}} + + ¥{{item.goodsUnitPrice}} + + 删除 + + + + + + + \ No newline at end of file diff --git a/packagecard/shop/catalog/bannerlist/goodscataloglist.wxss b/packagecard/shop/catalog/bannerlist/goodscataloglist.wxss new file mode 100644 index 0000000..c5f30f1 --- /dev/null +++ b/packagecard/shop/catalog/bannerlist/goodscataloglist.wxss @@ -0,0 +1 @@ +/* pages/shop/catalog/bannerlist/goodscataloglist.wxss */ \ No newline at end of file diff --git a/packagecard/shop/catalog/column/column.js b/packagecard/shop/catalog/column/column.js new file mode 100644 index 0000000..f06f41c --- /dev/null +++ b/packagecard/shop/catalog/column/column.js @@ -0,0 +1,475 @@ +// pages/category/index.js +const app = getApp() +Page({ + /** + * 页面的初始数据 + */ + data: { + CustomBar: app.globalData.CustomBar, + productList: [], + isRefreshing: false, + currentPage: 1, + totalSize: 0, + shopId: '', + isAddPage: false, + isCatalogPage: false, + activeNames: ['0'], + baseImageUrl: app.loginUrl + app.baseImgUrl, + currentCatalogId: '', + curIndex: 0, + active: 1, + curGoodsList: [], + contentHeight: app.globalData.windowHeight - app.globalData.CustomBar, + isLoadMore: false, + hasMore: true, + isShowCart: false, + shopCart: [], + baseImg: app.restAjax.baseUrl.tradeUrl + app.restAjax.baseUrl.baseImgUrl, + }, + /** + * 切换类目 + */ + switchRightTap(e) { + let curindex = parseInt(e.currentTarget.dataset.curindex); + this.data.productList[curindex].goodsList = [] + this.setData({ + currentPage: 1, + hasMore: true, + isLoadMore: false, + curIndex: curindex + }) + let item = this.data.productList[curindex] + this.getGoodsListByCId(item.categoryId) + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + this.setData({ + shopId: options.shopId, + shopCart: app.globalData.shopCart + }) + this.getShopCatalogList(this.data.shopId) + this.selectComponent('#sCart').refreshCart() + }, + //获取店铺所有商品类目 + getShopCatalogList(id) { + let _self = this + wx.showLoading({ + title: '加载中...', + }) + app.restAjax.get(app.restAjax.path(app.apis.getShopCatalogList, [app.baseUrls.tradeUrl, id]), {}, { + headers: { + token: app.globalData.token + } + }, (code, data) => { + wx.hideLoading({}) + _self.setData({ + isRefreshing: false + }) + if (code == 200) { + _self.buildDatas(data) + } + }, (code, error) => { + wx.hideLoading({}) + if (error.msg) { + app.dialog.msg(error.msg) + } else { + wx.showToast({ + title: '网络错误', + icon: 'error' + }) + } + }) + }, + doAdd(e) { + let key = e.currentTarget.dataset.key + if ('chooseCatalog' == key) { + wx.navigateTo({ + url: './choosecatalog?shopId=' + this.data.shopId, + }) + } else { + if (e.currentTarget.dataset.item) { + wx.navigateTo({ + url: './addproduct?shopId=' + this.data.shopId + '&cataLogId=' + e.currentTarget.dataset.item.categoryId, + }) + } else { + wx.showToast({ + title: '请先添加类目', + icon: 'error' + }) + } + } + }, + manageGoods(e) { + wx.navigateTo({ + url: '../../product/goodsdetail?shopId=' + e.currentTarget.dataset.item.shopId + '&goodsId=' + e.currentTarget.dataset.item.goodsId + }) + }, + /** + * 获取商品列表 + */ + getGoodsList(shopId) { + wx.showLoading({ + title: '加载中...', + }) + app.restAjax.get(app.restAjax.path(app.apis.getShopGoodsList, [app.baseUrls.tradeUrl, shopId]), {}, { + headers: { + token: app.globalData.token + } + }, (code, data) => { + wx.hideLoading({}) + this.setData({ + isRefreshing: false + }) + if (code == 200) { + this.buildDatas(data) + } + }, (code, error) => { + wx.hideLoading({}) + if (error.msg) { + app.dialog.msg(error.msg) + } else { + wx.showToast({ + title: '网络错误', + icon: 'error' + }) + } + }) + }, + //构建数据 + buildDatas(data) { + let _self = this + if (data.length > 0) { + data.forEach(el => { + el.goodsList = [] + _self.data.productList.push(el) + }) + _self.setData({ + curIndex: 0, + productList: _self.data.productList + }) + _self.getGoodsListByCId(_self.data.productList[0].categoryId) + } + }, + //去除重复的 + unique(rows) { + let temp = rows.concat() + let tempList = [] + for (var i = 0; i < temp.length; i++) { + for (var j = i + 1; j < temp.length; j++) { + if (temp[i].categoryId == temp[j].categoryId) { + temp.splice(j, 1); + j-- + } + } + } + temp.forEach(el => { + tempList.push({ + name: el.categoryName, + id: el.categoryId, + goods: [] + }) + }) + return tempList + }, + //刷新页面 + dorefreshList() { + this.setData({ + currentPage: 1, + isLoadMore: false, + hasMore: true, + productList: [] + }) + this.getShopCatalogList(this.data.shopId) + }, + onShow() { + if (this.data.isAddPage) { + this.setData({ + isAddPage: false + }) + this.dorefreshList() + } + this.selectComponent('#sCart').refreshCart() + }, + //根据类目ID获取商品 + getGoodsListByCId(id) { + let _self = this + wx.showLoading({ + title: '加载中...', + }) + app.restAjax.get(app.restAjax.path(app.apis.getGoodsByCatalogAndShop, [app.baseUrls.tradeUrl, id]), { + page: _self.data.currentPage, + shopId: _self.data.shopId + }, { + headers: { + token: app.globalData.token + } + }, (code, data) => { + wx.hideLoading({}) + _self.setData({ + isLoadMore: false + }) + if (code == 200) { + if (data.rows.length > 0) { + data.rows.forEach(it => { + it.buyNum = 0 + }) + data.rows.forEach(it => { + //判断购物车是否存在该商品 + if (app.globalData.shopCart.length > 0) { + app.globalData.shopCart.forEach(i => { + if (i.goodsId == it.goodsId) { + it.buyNum = i.buyNum + } + }) + } + }) + _self.data.productList.forEach(el => { + if (el.categoryId == id) { + el.goodsList = el.goodsList.concat(data.rows) + } + }) + _self.setData({ + productList: _self.data.productList + }) + } else { + _self.setData({ + hasMore: false + }) + } + } + }, (code, error) => { + wx.hideLoading({}) + _self.setData({ + isLoadMore: false + }) + if (error.msg) { + app.dialog.msg(error.msg) + } else { + wx.showToast({ + title: '网络错误', + icon: 'error' + }) + } + }) + }, + onChange(e) { + let _self = this + let item = e.currentTarget.dataset.item + this.setData({ + activeNames: e.detail, + currentCatalogId: item.categoryId + }) + console.log(e) + if (e.detail.length > 1) { + //展开 + if (item.goodsList || item.goodsList.length <= 0) { + _self.getGoodsListByCId(item.categoryId) + } + } + }, + doSearchGoods() { + wx.navigateTo({ + url: './searchproduct?shopId=' + this.data.shopId, + }) + }, + //加载更多 + doLoadMore(e) { + let _self = this + if (_self.data.hasMore) { + if (_self.data.isLoadMore) { + return + } + let item = _self.data.productList[_self.data.curIndex] + _self.setData({ + isLoadMore: true, + currentPage: ++_self.data.currentPage + }) + _self.getGoodsListByCId(item.categoryId) + } else { + wx.showToast({ + title: '暂无更多数据', + icon: 'none', + duration: 500 + }) + } + }, + doDelCategory(e) { + let _self = this + wx.showLoading({ + title: '删除中...', + }) + app.restAjax.delete(app.restAjax.path(app.apis.doDelShopCategoryById, [app.baseUrls.tradeUrl, e.currentTarget.dataset.item.categoryId]), {}, { + headers: { + token: app.globalData.token + } + }, (code, data) => { + wx.hideLoading({}) + if (code == 200) { + _self.setData({ + productList: [] + }) + wx.showToast({ + title: '删除成功', + icon: 'success' + }) + _self.getShopCatalogList(_self.data.shopId) + } + }, (code, error) => { + wx.hideLoading({}) + if (error.msg) { + app.dialog.msg(error.msg) + } else { + wx.showToast({ + title: '网络错误', + icon: 'error' + }) + } + }) + }, + showConfirmDialog(e) { + let _self = this + wx.showModal({ + title: '提示', + content: '确定要删除该类目吗?(删除后该类目下所有商品将删除!)', + success(res) { + if (res.confirm) { + _self.doDelCategory(e) + } else { + + } + } + }) + }, + //列表添加购物车 + addToCart(e) { + let _self = this + let goods = e.currentTarget.dataset.item + _self.data.productList[_self.data.curIndex].goodsList.forEach(it => { + if (goods.goodsId == it.goodsId) { + it.buyNum += 1 + if (it.buyNum > goods.goodsTotal) { + it.buyNum = goods.goodsTotal + wx.showToast({ + title: '超出库存', + icon: 'error' + }) + } + } + }) + this.selectComponent('#sCart').listAddToCart(goods) + _self.setData({ + productList: _self.data.productList, + shopCart: app.globalData.shopCart + }) + }, + removeToCart(e) { + let goods = e.currentTarget.dataset.item + let _self = this + _self.data.productList[_self.data.curIndex].goodsList.forEach(it => { + if (goods.goodsId == it.goodsId) { + it.buyNum -= 1 + } + }) + this.selectComponent('#sCart').listRemoveCart(goods) + _self.setData({ + productList: _self.data.productList, + shopCart: app.globalData.shopCart + }) + }, + //显示购物车弹框 + doShowCart() { + var _self = this + if (this.data.shopCart.length > 0) { + //判断当前购物车是否存在该商店的商品 + var isExist = false + this.data.shopCart.forEach(it => { + if (it.shopId == _self.data.shopId) { + isExist = true + } + }) + if (isExist) { + if (this.data.isShowCart) { + this.setData({ + isShowCart: false + }) + } else { + this.setData({ + isShowCart: true + }) + } + } else { + wx.showToast({ + title: '购物车空空如也', + icon: 'error' + }) + } + } else { + wx.showToast({ + title: '购物车空空如也', + icon: 'error' + }) + } + }, + //隐藏购物车弹框 + onHideCart() { + this.setData({ + isShowCart: false + }) + }, + //删除购物车中的商品 + delGoods(e) { + let _self = this + var index = e.currentTarget.dataset.index + var goods = e.currentTarget.dataset.goods + app.globalData.shopCart.splice(index, 1) + //删除购物车中数据 + _self.selectComponent('#sCart').refreshCart() + //将列表中的数据购买数量重置 + _self.data.productList[_self.data.curIndex].goodsList.forEach(it => { + if (it.goodsId == goods.goodsId) { + it.buyNum = 0 + } + }) + _self.setData({ + productList: _self.data.productList, + shopCart: app.globalData.shopCart + }) + if (_self.data.shopCart.length <= 0) { + _self.setData({ + isShowCart: false + }) + } + }, + //购物车弹框删除或添加商品 + onChange(e) { + let buyNum = e.detail + let goods = e.currentTarget.dataset.goods + let _self = this + //遍历列表 + _self.data.productList[_self.data.curIndex].goodsList.forEach(it => { + if (it.goodsId == goods.goodsId) { + it.buyNum = buyNum + } + }) + //遍历购物车 + _self.data.shopCart.forEach(it => { + if (it.goodsId == goods.goodsId) { + it.buyNum = buyNum + } + }) + //刷新视图 + _self.setData({ + productList: _self.data.productList, + shopCart: _self.data.shopCart + }) + //刷新购物车 + _self.selectComponent('#sCart').refreshCart() + }, + onHide() { + this.setData({ + isShowCart: false + }) + } +}) \ No newline at end of file diff --git a/packagecard/shop/catalog/column/column.json b/packagecard/shop/catalog/column/column.json new file mode 100644 index 0000000..457e187 --- /dev/null +++ b/packagecard/shop/catalog/column/column.json @@ -0,0 +1,6 @@ +{ + "navigationBarTitleText": "分类", + "usingComponents": { + "loadmore": "/components/loadmore/index" + } +} \ No newline at end of file diff --git a/packagecard/shop/catalog/column/column.wxml b/packagecard/shop/catalog/column/column.wxml new file mode 100644 index 0000000..db9e809 --- /dev/null +++ b/packagecard/shop/catalog/column/column.wxml @@ -0,0 +1,76 @@ + + + 商品管理 + + + + + + + {{item.categoryName}} + + + + + + + + + + + + + + {{item.goodsName}} + + + + {{item.goodsSummary}} + + + ¥:{{item.goodsUnitPrice}} + + + + {{item.buyNum}} + + + + + + + 加载中... + + + + + + + + + + + + + + {{item.goodsName}} + {{item.goodsSummary}} + + ¥{{item.goodsUnitPrice}} + + 删除 + + + + + + + \ No newline at end of file diff --git a/packagecard/shop/catalog/column/column.wxss b/packagecard/shop/catalog/column/column.wxss new file mode 100644 index 0000000..0f14c3c --- /dev/null +++ b/packagecard/shop/catalog/column/column.wxss @@ -0,0 +1,94 @@ +/* pages/mine/product/productmanage/productlist.wxss */ + +.category { + display: flex; + flex-direction: row; + height: 100%; + margin-bottom: 80rpx; +} + +.nav_left { + background: #f8f8f8; + width: 30%; + height: 100%; + white-space: nowrap; +} + +.nav_right { + background: #fff; + width: 70%; + height: 100%; +} + +.nav_left_bg { + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + padding: 10rpx; + background: #f8f8f8; + position: relative; +} + +::-webkit-scrollbar { + width: 0; + height: 0; + color: transparent; +} + +.nav_left_items { + font-size: 28rpx; + color: #333; + height: 100rpx; + line-height: 100rpx; + text-align: center; +} + +.nav_left_border { + border-left-color: #0054bd; + border-left-width: 2px; + border-left-style: solid; +} + +.nav_left_item-active { + background-color: #fff; + color: #0054bd; +} + +.jd-category { + margin: 40rpx 16rpx 0; +} + +.jd-category-wrap { + overflow: hidden; + padding: 20rpx 20rpx 0; +} + +.jd-category .title { + font-size: 28rpx; + height: 60rpx; + line-height: 30rpx; + font-weight: 700; + color: #080808 +} + +.jd-category-style { + width: 32.8%; + float: left; + display: flex; + flex-direction: column; + justify-content: center; +} + +.list_img { + width: 150rpx; + height: 150rpx; +} + +.list_text { + text-align: center; + font-size: 24rpx; + color: #686868; + margin-top: 10rpx; + height: 70rpx; +} \ No newline at end of file diff --git a/packagecard/shop/catalog/list/list.js b/packagecard/shop/catalog/list/list.js new file mode 100644 index 0000000..a218357 --- /dev/null +++ b/packagecard/shop/catalog/list/list.js @@ -0,0 +1,300 @@ +// pages/shop/catalog/list/list.js +const app = getApp() +Page({ + + /** + * 页面的初始数据 + */ + data: { + shopId: '', + active: 1, + swiperlist: [], + typeMenu: [], + goodsList: [], + currentPage: 1, + contentHeight: app.globalData.windowHeight, + isLoadMore: false, //是否在加载中 + hasMore: true, //是否还有更多数据 + currentPage: 1, + totalSize: 0, + baseImg: app.baseUrls.tradeUrl + app.baseUrls.baseImgUrl, + isShowCart: false, + shopCart: [], + countTime: 2000, //延迟搜索 时间 + searchWaiting: false, //是否等待搜索倒计时中, + searchKey: '' + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + this.setData({ + shopId: options.shopId, + shopCart: app.globalData.shopCart + }) + //获取全部商品 + this.getShopGoodsListByPage() + this.selectComponent('#sCart').refreshCart() + }, + getShopGoodsListByPage() { + let _self = this + wx.showLoading({ + title: '加载中...', + }) + app.restAjax.get( + app.restAjax.path(app.apis.getShopGoodsList, [app.baseUrls.tradeUrl, _self.data.shopId]), { + page: _self.data.currentPage, + keywords: _self.data.searchKey + }, { + headers: { + token: app.globalData.token + } + }, (code, data) => { + wx.hideLoading({}) + _self.setData({ + isLoadMore: false + }) + if (code == 200) { + if (data.rows.length > 0) { + data.rows.forEach(it => { + //构建图片 + var photos = it.goodsPhotos + var pList = photos.split(',') + it.showPhoto = _self.data.baseImg + pList[0] + //判断购物车是否存在该商品 + if (app.globalData.shopCart.length > 0) { + app.globalData.shopCart.forEach(i => { + if (i.goodsId == it.goodsId) { + it.buyNum = i.buyNum + } else { + it.buyNum = 0 + } + }) + } else { + it.buyNum = 0 + } + }) + _self.data.goodsList = _self.data.goodsList.concat(data.rows) + _self.setData({ + goodsList: _self.data.goodsList + }) + } else { + _self.setData({ + hasMore: false + }) + } + } + }, (code, error) => { + wx.hideLoading({}) + if (error.msg) { + app.dialog.msg(error.msg) + } else { + wx.showToast({ + title: '网络错误', + icon: 'error' + }) + } + }) + }, + doLoadMore(e) { + let _self = this + if (_self.data.hasMore) { + if (_self.data.isLoadMore) { + return + } + _self.setData({ + isLoadMore: true, + currentPage: ++_self.data.currentPage + }) + _self.getShopGoodsListByPage(_self.data.shopId) + } else { + wx.showToast({ + title: '暂无更多数据', + icon: 'none', + duration: 500 + }) + } + }, + //商品详情页面 + toGoodsDetail(e) { + let _self = this + wx.navigateTo({ + url: '../../product/goodsdetail?shopId=' + _self.data.shopId + '&goodsId=' + e.currentTarget.dataset.item.goodsId, + }) + }, + //列表添加购物车 + addToCart(e) { + let _self = this + let goods = e.currentTarget.dataset.item + _self.data.goodsList.forEach(it => { + if (goods.goodsId == it.goodsId) { + it.buyNum += 1 + if (it.buyNum > goods.goodsTotal) { + it.buyNum = goods.goodsTotal + wx.showToast({ + title: '超出库存', + icon: 'error' + }) + } + } + }) + this.selectComponent('#sCart').listAddToCart(goods) + _self.setData({ + goodsList: _self.data.goodsList, + shopCart: app.globalData.shopCart + }) + }, + removeToCart(e) { + let goods = e.currentTarget.dataset.item + let _self = this + _self.data.goodsList.forEach(it => { + if (goods.goodsId == it.goodsId) { + it.buyNum -= 1 + } + }) + this.selectComponent('#sCart').listRemoveCart(goods) + _self.setData({ + goodsList: _self.data.goodsList, + shopCart: app.globalData.shopCart + }) + }, + //显示购物车弹框 + doShowCart() { + var _self = this + if (this.data.shopCart.length > 0) { + //判断当前购物车是否存在该商店的商品 + var isExist = false + this.data.shopCart.forEach(it => { + if (it.shopId == _self.data.shopId) { + isExist = true + } + }) + if (isExist) { + if (this.data.isShowCart) { + this.setData({ + isShowCart: false + }) + } else { + this.setData({ + isShowCart: true + }) + } + } else { + wx.showToast({ + title: '购物车空空如也', + icon: 'error' + }) + } + } else { + wx.showToast({ + title: '购物车空空如也', + icon: 'error' + }) + } + }, + //隐藏购物车弹框 + onHideCart() { + this.setData({ + isShowCart: false + }) + }, + //删除购物车中的商品 + delGoods(e) { + let _self = this + var index = e.currentTarget.dataset.index + var goods = e.currentTarget.dataset.goods + app.globalData.shopCart.splice(index, 1) + //删除购物车中数据 + _self.selectComponent('#sCart').refreshCart() + //将列表中的数据购买数量重置 + _self.data.goodsList.forEach(it => { + if (it.goodsId == goods.goodsId) { + it.buyNum = 0 + } + }) + _self.setData({ + goodsList: _self.data.goodsList, + shopCart: app.globalData.shopCart + }) + if (_self.data.shopCart.length <= 0) { + _self.setData({ + isShowCart: false + }) + } + }, + //购物车弹框删除或添加商品 + onChange(e) { + let buyNum = e.detail + let goods = e.currentTarget.dataset.goods + let _self = this + //遍历列表 + _self.data.goodsList.forEach(it => { + if (it.goodsId == goods.goodsId) { + it.buyNum = buyNum + } + }) + //遍历购物车 + _self.data.shopCart.forEach(it => { + if (it.goodsId == goods.goodsId) { + it.buyNum = buyNum + } + }) + //刷新视图 + _self.setData({ + goodsList: _self.data.goodsList, + shopCart: _self.data.shopCart + }) + //刷新购物车 + _self.selectComponent('#sCart').refreshCart() + }, + onHide() { + this.setData({ + isShowCart: false + }) + }, + searchGoods(e) { + this.setData({ + countTime: 2000, + searchKey: e.detail.value, + }) + //是否处于搜索倒计时中 + if (!this.data.searchWaiting) { + this.timer(); + } + }, + /** + * 延迟搜索 + */ + timer() { + var that = this; + this.setData({ + searchWaiting: true + }) + + let promise = new Promise((resolve, reject) => { + let setTimer = setInterval( + () => { + console.log('搜索倒计时: ' + that.data.countTime); + this.setData({ + countTime: this.data.countTime - 1000 + }) + if (this.data.countTime <= 0) { + console.log('开始搜索: ' + that.data.params); + this.setData({ + countTime: 2000, + searchWaiting: false, + }) + resolve(setTimer) + } + }, 1000) + }) + promise.then((setTimer) => { + this.setData({ + currentPage: 1, + goodsList: [] + }) + this.getShopGoodsListByPage() + clearInterval(setTimer) //清除计时器 + }) + }, +}) \ No newline at end of file diff --git a/packagecard/pages/cardList/cardList.json b/packagecard/shop/catalog/list/list.json similarity index 100% rename from packagecard/pages/cardList/cardList.json rename to packagecard/shop/catalog/list/list.json diff --git a/packagecard/shop/catalog/list/list.wxml b/packagecard/shop/catalog/list/list.wxml new file mode 100644 index 0000000..5d43f97 --- /dev/null +++ b/packagecard/shop/catalog/list/list.wxml @@ -0,0 +1,60 @@ + + + 服务 + + + + + + + + + + + + + + + + 热销 + + + + + {{item.goodsName}} + + + ￥{{item.goodsUnitPrice}} + + + + + + + + + + + + + + + + + + + + {{item.goodsName}} + {{item.goodsSummary}} + + ¥{{item.goodsUnitPrice}} + + 删除 + + + + + + + \ No newline at end of file diff --git a/packagecard/shop/catalog/list/list.wxss b/packagecard/shop/catalog/list/list.wxss new file mode 100644 index 0000000..3273b4a --- /dev/null +++ b/packagecard/shop/catalog/list/list.wxss @@ -0,0 +1 @@ +/* pages/shop/catalog/list/list.wxss */ \ No newline at end of file diff --git a/packagecard/shop/index/shop.js b/packagecard/shop/index/shop.js new file mode 100644 index 0000000..c594bc8 --- /dev/null +++ b/packagecard/shop/index/shop.js @@ -0,0 +1,121 @@ +// pages/shop/shop.js +const app = getApp() +Page({ + /** + * 页面的初始数据 + */ + data: { + type: app.globalData.servicePageType, + isPageBack: false, + active: 1 + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + // if (this.data.type == 1) { + // console.log("测试") + // wx.navigateTo({ + // url: '../../shop/catalog/bannerlist/bannerlist' + // }) + // } else if (this.data.type == 2) { + // wx.navigateTo({ + // url: '../../shop/catalog/column/column', + // }) + // } else if (this.data.type == 3) { + // wx.navigateTo({ + // url: '../../shop/catalog/list/list', + // }) + // } else if (this.data.type == 4) { + // wx.navigateTo({ + // url: '../../shop/bespeak/bespeak', + // }) + // } + }, + tabChange(e) { + this.setData({ + active: e.detail + }) + if (this.data.active == 0) { + //首页 + wx.redirectTo({ + url: '/pages/index/index', + }) + } else if (this.data.active == 1) { + // 服务 + wx.redirectTo({ + url: '/pages/shop/index/shop', + }) + } else { + //我的 + wx.redirectTo({ + url: '/pages/mine/index/index', + }) + } + }, + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () {}, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + // if (!this.data.isPageBack) { + // if (this.data.type == 1) { + // console.log("测试") + // wx.navigateTo({ + // url: '../../shop/catalog/bannerlist/bannerlist' + // }) + // } else if (this.data.type == 2) { + // wx.navigateTo({ + // url: '../../shop/catalog/column/column', + // }) + // } else if (this.data.type == 3) { + // wx.navigateTo({ + // url: '../../shop/catalog/list/list', + // }) + // } else if (this.data.type == 4) { + // wx.navigateTo({ + // url: '../../shop/catalog/bannerlist/bannerlist' + // }) + // } + // } + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () {}, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () {}, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + }, + clickT: function () { + + } +}) \ No newline at end of file diff --git a/packagecard/pages/moments/edit/momentedit.json b/packagecard/shop/index/shop.json similarity index 100% rename from packagecard/pages/moments/edit/momentedit.json rename to packagecard/shop/index/shop.json diff --git a/packagecard/shop/index/shop.wxml b/packagecard/shop/index/shop.wxml new file mode 100644 index 0000000..7c0076d --- /dev/null +++ b/packagecard/shop/index/shop.wxml @@ -0,0 +1,8 @@ + + + + 服务 + + + 数据加载中... + \ No newline at end of file diff --git a/packagecard/shop/index/shop.wxss b/packagecard/shop/index/shop.wxss new file mode 100644 index 0000000..98cd144 --- /dev/null +++ b/packagecard/shop/index/shop.wxss @@ -0,0 +1 @@ +/* pages/shop/shop.wxss */ \ No newline at end of file diff --git a/packagecard/shop/product/affirmorder.js b/packagecard/shop/product/affirmorder.js new file mode 100644 index 0000000..747236b --- /dev/null +++ b/packagecard/shop/product/affirmorder.js @@ -0,0 +1,170 @@ +// pages/shop/product/affirmorder.js +const app = getApp() +Page({ + + /** + * 页面的初始数据 + */ + data: { + totalPrice: 0, + goodsList: [], //商品列表 + shopId: '', + shopDetailBean: null, //店铺详情 + baseImg: app.urls.baseImgUrl, + remark: '', //备注 + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + this.setData({ + shopId: options.shopId + }) + let shopCart = app.globalData.shopCart + let price = 0 + shopCart.forEach(it => { + if (it.shopId == this.data.shopId) { + it.totalPrice = it.goodsUnitPrice * it.buyNum + this.data.goodsList = this.data.goodsList.concat(it) + price += it.totalPrice + } + }) + //计算价格 + this.setData({ + totalPrice: price *= 100, + goodsList: this.data.goodsList + }) + this.getShopDetailById(this.data.shopId) + }, + //提交订单 + onSubmit() { + let _self = this + wx.showLoading({ + title: '预定中...', + }) + var params = _self.buildSubmitParams() + console.log(params) + app.restAjax.post(app.restAjax.path(app.restAjax.apis.doSaveOrder, [app.restAjax.baseUrl.tradeUrl]), params, { + headers: { + token: app.globalData.token + } + }, (code, data) => { + wx.hideLoading({}) + if (code == 200) { + //提交成功 + app.globalData.shopCart = [] + wx.redirectTo({ + url: '../../mine/order/ordersuccess?price=' + _self.data.totalPrice / 100 + '&shopId=' + _self.data.shopId + '&orderId=' + data.data, + }) + } + }, (code, err) => { + wx.hideLoading({}) + if (err.msg) { + app.dialog.msg(err.msg) + } else { + wx.showToast({ + title: '网络错误', + icon: 'error' + }) + } + }) + }, + //构建订单信息 + buildSubmitParams() { + let _self = this + var array = [] + _self.data.goodsList.forEach(it => { + var item = { + "goodsCount": it.buyNum, + "goodsId": it.goodsId, + "goodsLogo": it.goodsIcon, + "goodsName": it.goodsName, + "goodsPrice": it.goodsUnitPrice, + "shopId": it.shopId, + "totalPrice": it.totalPrice, + "words": _self.data.remark + } + array = array.concat(item) + }) + return array + }, + textareaBInput(e) { + this.setData({ + remark: e.detail.value + }) + }, + //获取店铺详情 + getShopDetailById(id) { + wx.showLoading({ + title: '加载中...', + }) + app.restAjax.get(app.restAjax.path(app.restAjax.apis.getShopDetail, [app.restAjax.baseUrl.tradeUrl, id]), {}, { + headers: { + token: app.globalData.token + } + }, (code, data) => { + wx.hideLoading({}) + if (code == 200) { + this.setData({ + shopDetailBean: data + }) + } + }, (code, err) => { + wx.hideLoading({}) + if (err.msg) { + app.dialog.msg(err.msg) + } else { + wx.showToast({ + title: '网络错误', + icon: 'error' + }) + } + }) + }, + //商品数量修改 + onChange(e) { + let buyNum = e.detail + let goods = e.currentTarget.dataset.goods + let _self = this + let price = 0 + _self.data.goodsList.forEach(it => { + if (it.goodsId == goods.goodsId) { + it.buyNum = buyNum + it.totalPrice = it.goodsUnitPrice * it.buyNum + } + price += it.totalPrice + }) + _self.setData({ + totalPrice: price * 100, + goodsList: _self.data.goodsList + }) + app.globalData.shopCart = _self.data.goodsList + }, + // 删除商品 + delGoods(e) { + let _self = this + var index = e.currentTarget.dataset.index + wx.showModal({ + title: '提示', + content: '确定要删除该商品吗?', + success(res) { + if (res.confirm) { + _self.data.goodsList.splice(index, 1) + _self.setData({ + goodsList: _self.data.goodsList + }) + var price = 0 + _self.data.goodsList.forEach(it => { + it.totalPrice = it.goodsUnitPrice * it.buyNum + price += it.totalPrice + }) + _self.setData({ + totalPrice: price * 100 + }) + app.globalData.shopCart = _self.data.goodsList + } + } + }) + } +}) \ No newline at end of file diff --git a/packagecard/pages/moments/list/momentslist.json b/packagecard/shop/product/affirmorder.json similarity index 100% rename from packagecard/pages/moments/list/momentslist.json rename to packagecard/shop/product/affirmorder.json diff --git a/packagecard/shop/product/affirmorder.wxml b/packagecard/shop/product/affirmorder.wxml new file mode 100644 index 0000000..d64df71 --- /dev/null +++ b/packagecard/shop/product/affirmorder.wxml @@ -0,0 +1,54 @@ + + + 订单确认 + + + + + + + + + + {{shopDetailBean.shopName}} + + 店铺地址:{{shopDetailBean.shopAddress}} + + + + + + + + + + {{item.goodsName}} + {{item.goodsSummary}} + + ¥{{item.goodsUnitPrice}} + + 删除 + + + + + + + + + + + 订单备注 + + + + + + + + + + + \ No newline at end of file diff --git a/packagecard/shop/product/affirmorder.wxss b/packagecard/shop/product/affirmorder.wxss new file mode 100644 index 0000000..090b183 --- /dev/null +++ b/packagecard/shop/product/affirmorder.wxss @@ -0,0 +1 @@ +/* pages/shop/product/affirmorder.wxss */ \ No newline at end of file diff --git a/packagecard/shop/product/goodsdetail.js b/packagecard/shop/product/goodsdetail.js new file mode 100644 index 0000000..5347ec5 --- /dev/null +++ b/packagecard/shop/product/goodsdetail.js @@ -0,0 +1,160 @@ +// pages/shop/product/goodsdetail.js +const app = getApp() +Page({ + + /** + * 页面的初始数据 + */ + data: { + shopId: '', //商店ID + goodsId: '', //商品ID + picList: [], //商品 + goodsDetail: null, //商品详情Bean + goodsPrices: 10000, + _options: null, + isShowCart: false, + shopCart: [], + baseImg: app.baseUrls.tradeUrl + app.baseUrls.baseImgUrl + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + this.setData({ + _options: options, + shopId: options.shopId, + goodsId: options.goodsId, + shopCart: app.globalData.shopCart + }) + console.log(this.data.baseImg) + this.getGoodsDetail() + }, + //获取商品详情 + getGoodsDetail() { + wx.showLoading({ + title: '加载中...', + }) + let _self = this + app.restAjax.get(app.restAjax.path(app.restAjax.apis.getGoodsDetail, [app.restAjax.baseUrl.tradeUrl, _self.data.goodsId]), {}, { + headers: { + token: app.globalData.token + } + }, (code, data) => { + wx.hideLoading({}) + if (code == 200) { + _self.buildPicList(data) + _self.setData({ + goodsDetail: data + }) + } + }, (code, err) => { + wx.hideLoading({}) + if (err.msg) { + app.dialog.msg(err.msg) + } else { + wx.showToast({ + title: '网络错误', + icon: 'error' + }) + } + }) + }, + //构建图片数据 + buildPicList(data) { + let _self = this + let picStrs = data.goodsPhotos.split(',') + picStrs.forEach(it => { + let url = _self.data.baseImg + it + _self.data.picList = _self.data.picList.concat(url) + }) + _self.setData({ + picList: _self.data.picList + }) + }, + + onShow() { + this.setData({ + shopCart: app.globalData.shopCart + }) + this.selectComponent('#sCart').refreshCart() + }, + //显示购物车弹框 + doShowCart() { + if (this.data.shopCart.length > 0) { + this.setData({ + isShowCart: true + }) + } else { + wx.showToast({ + title: '购物车空空如也', + icon: 'error' + }) + } + }, + //隐藏购物车弹框 + onHideCart() { + this.setData({ + isShowCart: false + }) + }, + //删除购物车中的商品 + delGoods(e) { + let _self = this + var index = e.currentTarget.dataset.index + var goods = e.currentTarget.dataset.goods + app.globalData.shopCart.splice(index, 1) + //删除购物车中数据 + _self.selectComponent('#sCart').refreshCart() + //将列表中的数据购买数量重置 + _self.data.goodsList.forEach(it => { + if (it.goodsId == goods.goodsId) { + it.buyNum = 0 + } + }) + _self.setData({ + goodsList: _self.data.goodsList, + shopCart: app.globalData.shopCart + }) + if (_self.data.shopCart.length <= 0) { + _self.setData({ + isShowCart: false + }) + } + }, + //购物车弹框删除或添加商品 + onChange(e) { + let buyNum = e.detail + let goods = e.currentTarget.dataset.goods + let _self = this + //遍历列表 + _self.data.goodsList.forEach(it => { + if (it.goodsId == goods.goodsId) { + it.buyNum = buyNum + } + }) + //遍历购物车 + _self.data.shopCart.forEach(it => { + if (it.goodsId == goods.goodsId) { + it.buyNum = buyNum + } + }) + //刷新视图 + _self.setData({ + goodsList: _self.data.goodsList, + shopCart: _self.data.shopCart + }) + //刷新购物车 + _self.selectComponent('#sCart').refreshCart() + }, + onHide() { + this.setData({ + isShowCart: false + }) + }, + doRefreshShopcart() { + this.setData({ + shopCart: app.globalData.shopCart + }) + } +}) \ No newline at end of file diff --git a/packagecard/shop/product/goodsdetail.json b/packagecard/shop/product/goodsdetail.json new file mode 100644 index 0000000..c307dc7 --- /dev/null +++ b/packagecard/shop/product/goodsdetail.json @@ -0,0 +1,5 @@ +{ + "usingComponents": { + "van-action-sheet": "/vant/dist/action-sheet/index" + } +} \ No newline at end of file diff --git a/packagecard/shop/product/goodsdetail.wxml b/packagecard/shop/product/goodsdetail.wxml new file mode 100644 index 0000000..98f06c2 --- /dev/null +++ b/packagecard/shop/product/goodsdetail.wxml @@ -0,0 +1,68 @@ + + + 详情 + + + + + + + + + + + + + + + ¥ {{goodsDetail.goodsUnitPrice}} + + + {{goodsDetail.goodsName}} + 库存:{{goodsDetail.goodsTotal}} + + + + {{goodsDetail.goodsSummary}} + + + 宝贝详情 + + + + + + + + + + + + + + + + + + + + + + {{item.goodsName}} + {{item.goodsSummary}} + + ¥{{item.goodsUnitPrice}} + + 删除 + + + + + + + \ No newline at end of file diff --git a/packagecard/shop/product/goodsdetail.wxss b/packagecard/shop/product/goodsdetail.wxss new file mode 100644 index 0000000..70c1d70 --- /dev/null +++ b/packagecard/shop/product/goodsdetail.wxss @@ -0,0 +1,11 @@ +/* pages/shop/product/goodsdetail.wxss */ +.scroll-content { + position: absolute; + width: 100%; + top: 530rpx; + border-top-right-radius: 60rpx; + border-top-left-radius: 60rpx; + padding-top: 20rpx; + z-index: 30; + background-color: white; +} \ No newline at end of file diff --git a/packagecard/shop/product/product.js b/packagecard/shop/product/product.js new file mode 100644 index 0000000..37ed604 --- /dev/null +++ b/packagecard/shop/product/product.js @@ -0,0 +1,98 @@ +// pages/shop/product/product.js +const app = getApp() +Page({ + + /** + * 页面的初始数据 + */ + data: { + isSticky: false, + titleBarHeight: 0, + statusBarHeight: 0, + swiperlist: [ + 'https://image.weilanwl.com/img/4x3-1.jpg', + 'https://image.weilanwl.com/img/4x3-2.jpg', + 'https://image.weilanwl.com/img/4x3-3.jpg', + 'https://image.weilanwl.com/img/4x3-4.jpg', + ], + tabList: [ + "热门推荐", + "破尿酸", + "除皱瘦脸", + "眼部整形", + "水光华能" + ], + TabCur: 0, + scrollLeft: 0 + }, + tabSelect(e) { + this.setData({ + TabCur: e.currentTarget.dataset.id, + scrollLeft: (e.currentTarget.dataset.id - 1) * 60 + }) + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + let height = app.globalData.CustomBar + let statusHeight = app.globalData.StatusBar + this.setData({ + titleBarHeight: height, + statusBarHeight: statusHeight + }) + }, + scrollSticky(event) { + this.setData({ + isSticky: event.detail.isFixed + }) + }, + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/packagecard/shop/product/product.json b/packagecard/shop/product/product.json new file mode 100644 index 0000000..e94303e --- /dev/null +++ b/packagecard/shop/product/product.json @@ -0,0 +1,5 @@ +{ + "usingComponents": { + "van-sticky": "../../../vant/dist/sticky/index" + } +} \ No newline at end of file diff --git a/packagecard/shop/product/product.wxml b/packagecard/shop/product/product.wxml new file mode 100644 index 0000000..1d8f294 --- /dev/null +++ b/packagecard/shop/product/product.wxml @@ -0,0 +1,24 @@ + + + 商品详情 + + + + + + + + + + + + + + + {{tabList[index]}} + + + + \ No newline at end of file diff --git a/packagecard/shop/product/product.wxss b/packagecard/shop/product/product.wxss new file mode 100644 index 0000000..ae8edfd --- /dev/null +++ b/packagecard/shop/product/product.wxss @@ -0,0 +1 @@ +/* pages/shop/product/product.wxss */ \ No newline at end of file diff --git a/packagecard/shop/shopingcart/cart.js b/packagecard/shop/shopingcart/cart.js new file mode 100644 index 0000000..65752b8 --- /dev/null +++ b/packagecard/shop/shopingcart/cart.js @@ -0,0 +1,66 @@ +// pages/shop/shopingcart/cart.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/packagecard/pages/moments/list/momentsshowlist.json b/packagecard/shop/shopingcart/cart.json similarity index 100% rename from packagecard/pages/moments/list/momentsshowlist.json rename to packagecard/shop/shopingcart/cart.json diff --git a/packagecard/shop/shopingcart/cart.wxml b/packagecard/shop/shopingcart/cart.wxml new file mode 100644 index 0000000..06aee2e --- /dev/null +++ b/packagecard/shop/shopingcart/cart.wxml @@ -0,0 +1,2 @@ + +pages/shop/shopingcart/cart.wxml diff --git a/packagecard/shop/shopingcart/cart.wxss b/packagecard/shop/shopingcart/cart.wxss new file mode 100644 index 0000000..5db4629 --- /dev/null +++ b/packagecard/shop/shopingcart/cart.wxss @@ -0,0 +1 @@ +/* pages/shop/shopingcart/cart.wxss */ \ No newline at end of file diff --git a/pages/mine/columnlist/columnlist.js b/pages/mine/columnlist/columnlist.js new file mode 100644 index 0000000..d82c238 --- /dev/null +++ b/pages/mine/columnlist/columnlist.js @@ -0,0 +1,72 @@ +// pages/mine/columnlist/columnlist.js +const app = getApp() +Page({ + + /** + * 页面的初始数据 + */ + data: { + groupId: '', + menuList: [], + title: '栏目', + imgUrl: app.urls.baseImgUrl + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + this.setData({ + groupId: options.id, + title: options.title + }) + this.getList() + }, + + getList() { + wx.showLoading({ + title: '加载中...', + }) + var _self = this + app.http.get(app.urls.getColumnListByGroupId, { + header: { + token: app.globalData.token + }, + data: { + configColumnGroupId: _self.data.groupId + } + }) + .then(res => { + wx.hideLoading({}) + _self.setData({ + menuList: res.data + }) + }) + .catch(err => { + wx.hideLoading({}) + }) + }, + choosePage(e) { + // 栏目列表页跳转方式1:小程序页面,2:其他小程序,3:网址 + var path = e.currentTarget.dataset.path + var type = e.currentTarget.dataset.type + var item = e.currentTarget.dataset.item + switch (type) { + case '1': //跳转小程序内部 + case '3': //链接 + wx.navigateTo({ + url: path + '?id=' + item.configColumnId + '&mode=' + item.configTableMode + '&type=' + item.configColumnType + '&title=' + item.configColumnName + }) + break + case '2': //其他小程序 + wx.navigateToMiniProgram({ + appId: '', + success(res) { + // 打开成功 + } + }) + break + } + }, + +}) \ No newline at end of file diff --git a/packagecard/pages/moments/momentsdetail/momentsdetail.json b/pages/mine/columnlist/columnlist.json similarity index 100% rename from packagecard/pages/moments/momentsdetail/momentsdetail.json rename to pages/mine/columnlist/columnlist.json diff --git a/pages/mine/columnlist/columnlist.wxml b/pages/mine/columnlist/columnlist.wxml new file mode 100644 index 0000000..fcca931 --- /dev/null +++ b/pages/mine/columnlist/columnlist.wxml @@ -0,0 +1,31 @@ + + + {{title}} + + + + + + + + + + + {{group.configColumnName}} + + + {{group.configColumnRemark}} + + + + + + + + + + + \ No newline at end of file diff --git a/pages/mine/columnlist/columnlist.wxss b/pages/mine/columnlist/columnlist.wxss new file mode 100644 index 0000000..40eb1ec --- /dev/null +++ b/pages/mine/columnlist/columnlist.wxss @@ -0,0 +1 @@ +/* pages/mine/columnlist/columnlist.wxss */ \ No newline at end of file diff --git a/pages/mine/index/index.js b/pages/mine/index/index.js index 30fdc9b..a5bdd3e 100644 --- a/pages/mine/index/index.js +++ b/pages/mine/index/index.js @@ -11,6 +11,7 @@ Page({ userIcon: '../../../images/ic_user_default.png', menuList: [], imgUrl: app.urls.baseImgUrl, + Height: 0, }, /** * 生命周期函数--监听页面加载 @@ -21,7 +22,6 @@ Page({ nickName: app.globalData.userInfo.name, name: app.globalData.userInfo.name }) - _self.getItemList() }, getItemList() { wx.showLoading({ @@ -157,6 +157,13 @@ Page({ onPullDownRefresh() { this.getItemList() }, + //跳转到二级栏目页面 + goColumnList(e) { + var item = e.currentTarget.dataset.item + wx.navigateTo({ + url: '../columnlist/columnlist?id=' + item.configColumnGroupId + '&title=' + item.configColumnGroupName, + }) + }, // 跳转到 我的名片 goMyCard: function () { wx.navigateTo({ @@ -168,5 +175,30 @@ Page({ wx.navigateTo({ url: '../../mine/setting/columnsetting' }) + }, + imgHeight(e) { + var winWid = wx.getSystemInfoSync().windowWidth; //获取当前屏幕的宽度 + var imgh = e.detail.height; //图片高度 + var imgw = e.detail.width; //图片宽度 + var swiperH = winWid * imgh / imgw * 0.88 + "px" + + this.setData({ + Height: swiperH //设置高度 + }) + }, + //引导跳转 + toFunction(e) { + var _self = this + var path = '' + _self.data.menuList.forEach(it => { + //判断引导 + if (it.configColumnGroupDirection == '3') { + //引导 + path = it.configColumnGroupTargetUrl + } + }) + wx.navigateTo({ + url: path, + }) } }) \ No newline at end of file diff --git a/pages/mine/index/index.wxml b/pages/mine/index/index.wxml index 4f09c2e..b4f3aa5 100644 --- a/pages/mine/index/index.wxml +++ b/pages/mine/index/index.wxml @@ -19,6 +19,10 @@ wx:for-item="group" wx:for="{{menuList}}" wx:key="index" wx:if="{{group.configColumnGroupStatus=='1'}}"> + + {{group.configColumnGroupName}} + + - - - - - - - - {{item.configColumnName}} - - - {{item.configColumnRemark}} - + + + + + + + {{group.configColumnGroupName}} - + + {{group.configColumnGroupRemark}} + + + + + + + + {{group.configColumnGroupName}} + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + + + + + + + + \ No newline at end of file diff --git a/pages/mine/index/index.wxss b/pages/mine/index/index.wxss index feb2625..fe7ccfa 100644 --- a/pages/mine/index/index.wxss +++ b/pages/mine/index/index.wxss @@ -123,4 +123,29 @@ map, .play-box image { width: 60rpx; height: 60rpx; +} + +.creat-card { + position: fixed; + right: 20rpx; + bottom: 20rpx; + padding: 20rpx; + background: #0054bd; + border-radius: 50%; + box-sizing: border-box; + align-items: center; + justify-content: center; + flex-direction: column; + width: 140rpx; + height: 140rpx; + z-index: 100; +} + +.creat-card image { + width: 80rpx; + height: 60rpx; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); } \ No newline at end of file diff --git a/pages/mine/setting/columnsetting.wxml b/pages/mine/setting/columnsetting.wxml index 0ea10b7..74c6739 100644 --- a/pages/mine/setting/columnsetting.wxml +++ b/pages/mine/setting/columnsetting.wxml @@ -27,14 +27,14 @@ - + - {{item.configColumnName}} diff --git a/utils/api.js b/utils/api.js index e9448dd..72b27ee 100644 --- a/utils/api.js +++ b/utils/api.js @@ -7,8 +7,7 @@ var apis = { doUploadAudio: `app/file/uploadaudio`, //上传音频 /**用户相关 */ wxLogin: `wechat/miniapp/sign/default`, //微信用户登录 - /**个人中心 */ - getMenuList: `app/configcolumngroup/list`, + /**店铺相关 **/ doSaveShop: `app/shop/save`, //保存商店 doUpdateShopInfo: `app/shop/updateshop/{shopId}`, //更新店铺信息 @@ -49,6 +48,8 @@ var apis = { //个人中心列表 //栏目数据 + /**个人中心 */ + getMenuList: `app/cardconfigcolumngroup/list`, getMomentsList: `app/configcolumndata/list/{configColumnId}`, //获取栏目数据列表 doSaveMoments: `app/configcolumndata/save/{configColumnId}`, //保存栏目数据 getMomentsField: `app/configcolumndata/listfield/{configColumnId}`, //获取栏目字段列表 @@ -59,6 +60,7 @@ var apis = { getMineColumnList: `app/configcolumnset/list`, //获取我的栏目配置列表 doSaveColumnDisplay: `app/configcolumnset/savedisplay`, //保存我的栏目隐藏显示 doSaveColumnName: `app/configcolumnset/savename`, //保存我的栏目名称 + getColumnListByGroupId: `app/configcolumn/list`, //根据栏目组id获取栏目? configColumnGroupId //名片信息 getCardList: `app/cardtemplate/list`, //获取名片列表