From 74cd94023549a51cf106a23c2571ecf7fa5eb21c Mon Sep 17 00:00:00 2001 From: asd <374367073@qq.com> Date: Mon, 16 Dec 2019 18:26:28 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 83 +++++++----- components/index/list/commodity/index.js | 13 +- components/index/list/commodity/index.wxml | 2 +- components/member/membershop/membershop.scss | 1 + components/member/membershop/membershop.wxss | 1 + .../orderconfirm/orderbottom/orderbottom.js | 38 +++--- .../orderconfirm/orderbottom/orderbottom.wxml | 2 +- .../orderchooseaddr/orderchooseaddr.js | 38 +++--- .../orderchooseaddr/orderchooseaddr.wxml | 2 +- pages/addaddress/addaddress.js | 96 ++++++------- pages/addaddress/addaddress.wxml | 2 +- pages/chooseaddr/chooseaddr.js | 96 ++++++------- pages/chooseaddr/chooseaddr.wxml | 2 +- pages/personal/personal.js | 126 +++++++++++------- pages/personal/personal.wxml | 25 +++- pages/product/product.js | 99 +++++++------- pages/product/product.wxml | 2 +- pages/shopping/shopping.js | 96 ++++++------- pages/shopping/shopping.wxml | 2 +- 19 files changed, 413 insertions(+), 313 deletions(-) diff --git a/app.json b/app.json index 9218e33..12d12ad 100644 --- a/app.json +++ b/app.json @@ -1,36 +1,51 @@ { - "pages": [ - "pages/index/index", - "pages/search/search", - "pages/shopping/shopping", - "pages/classify/classify", - "pages/product/product", - "pages/personal/personal", - "pages/message/message", - "pages/orderconfirm/orderconfirm", - "pages/order/order", - "pages/chooseaddr/chooseaddr", - "pages/addaddress/addaddress", - "pages/particulars/particulars", - "pages/undetermined/undetermined", - "pages/receiving/receiving", - "pages/status/status", - "pages/accomplish/accomplish", - "pages/sales1/sales1", - "pages/sales2/sales2", - "pages/member/member", - "pages/yue/yue", - - "pages/yongjin/yongjin", - - "pages/share/share" - ], - "window": { - "backgroundTextStyle": "light", - "navigationBarBackgroundColor": "#fff", - "navigationBarTitleText": "WeChat", - "navigationBarTextStyle": "black" - }, - "style": "v2", - "sitemapLocation": "sitemap.json" + "pages": [ + "pages/index/index", + "pages/search/search", + "pages/shopping/shopping", + "pages/classify/classify", + "pages/product/product", + "pages/personal/personal", + "pages/message/message", + "pages/orderconfirm/orderconfirm", + "pages/order/order", + "pages/chooseaddr/chooseaddr", + "pages/addaddress/addaddress", + "pages/particulars/particulars", + "pages/undetermined/undetermined", + "pages/receiving/receiving", + "pages/status/status", + "pages/accomplish/accomplish", + "pages/sales1/sales1", + "pages/sales2/sales2", + "pages/member/member", + "pages/yue/yue", + + "pages/yongjin/yongjin", + + "pages/share/share" + ], + "window": { + "backgroundTextStyle": "light", + "navigationBarBackgroundColor": "#fff", + "navigationBarTitleText": "WeChat", + "navigationBarTextStyle": "black" + }, + "tabBar": { + "list": [{ + "pagePath": "pages/index/index", + "text": "首页" + }, { + "pagePath": "pages/classify/classify", + "text": "分类" + }, { + "pagePath": "pages/shopping/shopping", + "text": "购物车" + }, { + "pagePath": "pages/personal/personal", + "text": "我的" + }] + }, + "style": "v2", + "sitemapLocation": "sitemap.json" } \ No newline at end of file diff --git a/components/index/list/commodity/index.js b/components/index/list/commodity/index.js index 035c745..8423aa4 100644 --- a/components/index/list/commodity/index.js +++ b/components/index/list/commodity/index.js @@ -1,8 +1,11 @@ Component({ - properties: { - }, - data: { - }, + properties: {}, + data: {}, methods: { + gotodetail() { + wx.navigateTo({ + url: "/pages/product/product" + }) + } } - }) \ No newline at end of file +}) \ No newline at end of file diff --git a/components/index/list/commodity/index.wxml b/components/index/list/commodity/index.wxml index 6c27b73..635e5ff 100644 --- a/components/index/list/commodity/index.wxml +++ b/components/index/list/commodity/index.wxml @@ -1,4 +1,4 @@ - + diff --git a/components/member/membershop/membershop.scss b/components/member/membershop/membershop.scss index e24156f..9cc74c5 100644 --- a/components/member/membershop/membershop.scss +++ b/components/member/membershop/membershop.scss @@ -9,6 +9,7 @@ margin: 0 auto; position: relative; top: 64rpx; + left: 121rpx; } .shopname { width: 273rpx; diff --git a/components/member/membershop/membershop.wxss b/components/member/membershop/membershop.wxss index c664642..dcf8b68 100644 --- a/components/member/membershop/membershop.wxss +++ b/components/member/membershop/membershop.wxss @@ -11,6 +11,7 @@ margin: 0 auto; position: relative; top: 64rpx; + left: 121rpx; } .membershop .shopname { diff --git a/components/orderconfirm/orderbottom/orderbottom.js b/components/orderconfirm/orderbottom/orderbottom.js index 582dbcf..5462fff 100644 --- a/components/orderconfirm/orderbottom/orderbottom.js +++ b/components/orderconfirm/orderbottom/orderbottom.js @@ -1,23 +1,27 @@ // components/orderconfirm/orderbottom/orderbottom.js Component({ - /** - * 组件的属性列表 - */ - properties: { + /** + * 组件的属性列表 + */ + properties: { - }, + }, - /** - * 组件的初始数据 - */ - data: { + /** + * 组件的初始数据 + */ + data: { - }, + }, - /** - * 组件的方法列表 - */ - methods: { - - } -}) + /** + * 组件的方法列表 + */ + methods: { + sub() { + wx.navigateTo({ + url: "/pages/order/order" + }) + } + } +}) \ No newline at end of file diff --git a/components/orderconfirm/orderbottom/orderbottom.wxml b/components/orderconfirm/orderbottom/orderbottom.wxml index a449666..b985565 100644 --- a/components/orderconfirm/orderbottom/orderbottom.wxml +++ b/components/orderconfirm/orderbottom/orderbottom.wxml @@ -3,5 +3,5 @@ 总计 $0.00 - 结算 + 结算 \ No newline at end of file diff --git a/components/orderconfirm/orderchooseaddr/orderchooseaddr.js b/components/orderconfirm/orderchooseaddr/orderchooseaddr.js index e2c905a..5ff1b48 100644 --- a/components/orderconfirm/orderchooseaddr/orderchooseaddr.js +++ b/components/orderconfirm/orderchooseaddr/orderchooseaddr.js @@ -1,23 +1,27 @@ // components/orderconfirm/orderchooseaddr/orderchooseaddr.js Component({ - /** - * 组件的属性列表 - */ - properties: { + /** + * 组件的属性列表 + */ + properties: { - }, + }, - /** - * 组件的初始数据 - */ - data: { + /** + * 组件的初始数据 + */ + data: { - }, + }, - /** - * 组件的方法列表 - */ - methods: { - - } -}) + /** + * 组件的方法列表 + */ + methods: { + choose() { + wx.navigateTo({ + url: "/pages/chooseaddr/chooseaddr" + }) + } + } +}) \ No newline at end of file diff --git a/components/orderconfirm/orderchooseaddr/orderchooseaddr.wxml b/components/orderconfirm/orderchooseaddr/orderchooseaddr.wxml index 99d00a1..c9d3167 100644 --- a/components/orderconfirm/orderchooseaddr/orderchooseaddr.wxml +++ b/components/orderconfirm/orderchooseaddr/orderchooseaddr.wxml @@ -1,4 +1,4 @@ - + 于于宇 15698857895 diff --git a/pages/addaddress/addaddress.js b/pages/addaddress/addaddress.js index 40bbebd..75727ce 100644 --- a/pages/addaddress/addaddress.js +++ b/pages/addaddress/addaddress.js @@ -1,66 +1,70 @@ // pages/addaddress/addaddress.js Page({ - /** - * 页面的初始数据 - */ - data: { + /** + * 页面的初始数据 + */ + data: { - }, + }, - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function(options) { - }, + }, + save() { + wx.navigateTo({ + url: "/pages/chooseaddr/chooseaddr" + }) + }, + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function() { - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { + }, - }, + /** + * 生命周期函数--监听页面显示 + */ + onShow: function() { - /** - * 生命周期函数--监听页面显示 - */ - onShow: function () { + }, - }, + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function() { - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function () { + }, - }, + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function() { - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function () { + }, - }, + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function() { - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function () { + }, - }, + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function() { - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function () { + }, - }, + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function() { - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - - } + } }) \ No newline at end of file diff --git a/pages/addaddress/addaddress.wxml b/pages/addaddress/addaddress.wxml index 5ad208b..5e8f347 100644 --- a/pages/addaddress/addaddress.wxml +++ b/pages/addaddress/addaddress.wxml @@ -6,5 +6,5 @@ - + \ No newline at end of file diff --git a/pages/chooseaddr/chooseaddr.js b/pages/chooseaddr/chooseaddr.js index 3ed0d84..0e3ad82 100644 --- a/pages/chooseaddr/chooseaddr.js +++ b/pages/chooseaddr/chooseaddr.js @@ -1,66 +1,70 @@ // pages/chooseaddr/chooseaddr.js Page({ - /** - * 页面的初始数据 - */ - data: { + /** + * 页面的初始数据 + */ + data: { - }, + }, - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function(options) { - }, + }, + add() { + wx.navigateTo({ + url: "/pages/addaddress/addaddress" + }) + }, + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function() { - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { + }, - }, + /** + * 生命周期函数--监听页面显示 + */ + onShow: function() { - /** - * 生命周期函数--监听页面显示 - */ - onShow: function () { + }, - }, + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function() { - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function () { + }, - }, + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function() { - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function () { + }, - }, + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function() { - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function () { + }, - }, + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function() { - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function () { + }, - }, + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function() { - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - - } + } }) \ No newline at end of file diff --git a/pages/chooseaddr/chooseaddr.wxml b/pages/chooseaddr/chooseaddr.wxml index 5a4d12c..302db04 100644 --- a/pages/chooseaddr/chooseaddr.wxml +++ b/pages/chooseaddr/chooseaddr.wxml @@ -8,7 +8,7 @@
- + \ No newline at end of file diff --git a/pages/personal/personal.js b/pages/personal/personal.js index 6bd20fc..acb09a3 100644 --- a/pages/personal/personal.js +++ b/pages/personal/personal.js @@ -1,66 +1,102 @@ // pages/personal/personal.js Page({ - /** - * 页面的初始数据 - */ - data: { + /** + * 页面的初始数据 + */ + data: { - }, + }, - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function(options) { - }, + }, + toorder() { + wx.navigateTo({ + url: "/pages/order/order" + }) + }, + toaddress() { + wx.navigateTo({ + url: "/pages/chooseaddr/chooseaddr" + }) + }, + toserver() { + // wx.navigateTo({ + // url: "/pages/order/order" + // }) + }, + tomember() { + wx.navigateTo({ + url: "/pages/member/member" + }) + }, + toorder() { + wx.navigateTo({ + url: "/pages/order/order" + }) + }, + toyue() { + wx.navigateTo({ + url: "/pages/yue/yue" + }) + }, - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { + toyongjin() { + wx.navigateTo({ + url: "/pages/yongjin/yongjin" + }) + }, - }, + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function() { - /** - * 生命周期函数--监听页面显示 - */ - onShow: function () { + }, - }, + /** + * 生命周期函数--监听页面显示 + */ + onShow: function() { - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function () { + }, - }, + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function() { - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function () { + }, - }, + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function() { - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function () { + }, - }, + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function() { - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function () { + }, - }, + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function() { - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { + }, - } + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function() { + + } }) \ No newline at end of file diff --git a/pages/personal/personal.wxml b/pages/personal/personal.wxml index b5ca7ef..4aba087 100644 --- a/pages/personal/personal.wxml +++ b/pages/personal/personal.wxml @@ -10,17 +10,34 @@ - + 我的订单 > - - 我的订单 + + 地址管理 > - + + 在线客服 + + + 会员中心 非会员 > + + 我的余额 + + + + 当前佣金 + + + + 分 享 + + + \ No newline at end of file diff --git a/pages/product/product.js b/pages/product/product.js index b86c728..14f3d71 100644 --- a/pages/product/product.js +++ b/pages/product/product.js @@ -1,66 +1,73 @@ // pages/product/product.js Page({ - /** - * 页面的初始数据 - */ - data: { - array: ['20粒', '30粒', '50粒', '100粒'] - }, + /** + * 页面的初始数据 + */ + data: { + array: ['20粒', '30粒', '50粒', '100粒'] + }, - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function(options) { - }, + }, + // goshop() { - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { + // }, + bindPickerChange(e) { + wx.switchTab({ + url: '/pages/shopping/shopping' + }) + }, + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function() { - }, + }, - /** - * 生命周期函数--监听页面显示 - */ - onShow: function () { + /** + * 生命周期函数--监听页面显示 + */ + onShow: function() { - }, + }, - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function () { + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function() { - }, + }, - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function () { + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function() { - }, + }, - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function () { + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function() { - }, + }, - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function () { + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function() { - }, + }, - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function() { - } + } }) \ No newline at end of file diff --git a/pages/product/product.wxml b/pages/product/product.wxml index 1ca5527..c623400 100644 --- a/pages/product/product.wxml +++ b/pages/product/product.wxml @@ -19,6 +19,6 @@ 产品名称产品名称产品名称 $140,000 - 加入购物车 + 加入购物车 \ No newline at end of file diff --git a/pages/shopping/shopping.js b/pages/shopping/shopping.js index 0cfeec3..c51647f 100644 --- a/pages/shopping/shopping.js +++ b/pages/shopping/shopping.js @@ -1,66 +1,70 @@ // pages/shopping/shopping.js Page({ - /** - * 页面的初始数据 - */ - data: { + /** + * 页面的初始数据 + */ + data: { - }, + }, - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function(options) { - }, + }, + sub() { + wx.navigateTo({ + url: "/pages/orderconfirm/orderconfirm" + }) + }, + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function() { - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { + }, - }, + /** + * 生命周期函数--监听页面显示 + */ + onShow: function() { - /** - * 生命周期函数--监听页面显示 - */ - onShow: function () { + }, - }, + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function() { - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function () { + }, - }, + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function() { - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function () { + }, - }, + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function() { - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function () { + }, - }, + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function() { - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function () { + }, - }, + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function() { - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - - } + } }) \ No newline at end of file diff --git a/pages/shopping/shopping.wxml b/pages/shopping/shopping.wxml index 0b94649..c5706dc 100644 --- a/pages/shopping/shopping.wxml +++ b/pages/shopping/shopping.wxml @@ -19,7 +19,7 @@ 删除 - 结算 + 结算 \ No newline at end of file