From e73c80c1a92bc6e48d541d72a5219e4d57b13101 Mon Sep 17 00:00:00 2001 From: ivo Date: Wed, 1 Feb 2023 21:46:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=B7=BB=E5=8A=A0=E5=89=82?= =?UTF-8?q?=E5=88=97=E8=A1=A8=EF=BC=8C=E6=A0=87=E5=87=86=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 13 +-- custom-tab-bar/data.js | 12 +-- custom-tab-bar/index.wxml | 26 ++---- images/standard.jpg | Bin 0 -> 39555 bytes images/weixin.png | Bin 0 -> 5967 bytes pages/additive/list/additive-list.js | 111 +++++++++++++++++++++++++ pages/additive/list/additive-list.json | 12 +++ pages/additive/list/additive-list.wxml | 17 ++++ pages/additive/list/additive-list.wxss | 21 +++++ pages/home/home.js | 4 +- pages/home/home.wxml | 2 +- pages/home/session/session.js | 2 +- pages/standard/list/index.js | 109 ++++++++++++++++++++++++ pages/standard/list/index.json | 8 ++ pages/standard/list/index.wxml | 20 +++++ pages/standard/list/index.wxss | 64 ++++++++++++++ pages/user/index.js | 73 ++++++++++++++++ pages/user/index.json | 6 ++ pages/user/index.wxml | 9 ++ pages/user/index.wxss | 40 +++++++++ pages/usercenter/index.wxml | 46 ++++------ services/api/additive.js | 11 +++ services/api/standard.js | 11 +++ 23 files changed, 553 insertions(+), 64 deletions(-) create mode 100644 images/standard.jpg create mode 100644 images/weixin.png create mode 100644 pages/additive/list/additive-list.js create mode 100644 pages/additive/list/additive-list.json create mode 100644 pages/additive/list/additive-list.wxml create mode 100644 pages/additive/list/additive-list.wxss create mode 100644 pages/standard/list/index.js create mode 100644 pages/standard/list/index.json create mode 100644 pages/standard/list/index.wxml create mode 100644 pages/standard/list/index.wxss create mode 100644 pages/user/index.js create mode 100644 pages/user/index.json create mode 100644 pages/user/index.wxml create mode 100644 pages/user/index.wxss create mode 100644 services/api/additive.js create mode 100644 services/api/standard.js diff --git a/app.json b/app.json index 0920223..d241a88 100644 --- a/app.json +++ b/app.json @@ -31,7 +31,10 @@ "pages/usercenter/name-edit/index", "pages/home/session/session", "pages/home/additive/additive", - "pages/home/chemical/chemical" + "pages/home/chemical/chemical", + "pages/additive/list/additive-list", + "pages/standard/list/index", + "pages/user/index" ], "tabBar": { "custom": true, @@ -45,15 +48,15 @@ "text": "首页" }, { - "pagePath": "pages/goods/category/index", + "pagePath": "pages/additive/list/additive-list", "text": "分类" }, { - "pagePath": "pages/cart/index", - "text": "购物车" + "pagePath": "pages/standard/list/index", + "text": "标准" }, { - "pagePath": "pages/usercenter/index", + "pagePath": "pages/user/index", "text": "我的" } ] diff --git a/custom-tab-bar/data.js b/custom-tab-bar/data.js index ba35a99..32ea82f 100644 --- a/custom-tab-bar/data.js +++ b/custom-tab-bar/data.js @@ -5,17 +5,17 @@ export default [{ }, { icon: 'sort', - text: '分类', - url: 'pages/goods/category/index', + text: '添加剂', + url: 'pages/additive/list/additive-list', }, { - icon: 'cart', - text: '购物车', - url: 'pages/cart/index', + icon: 'wallet', + text: '标准', + url: 'pages/standard/list/index', }, { icon: 'person', text: '个人中心', - url: 'pages/usercenter/index', + url: 'pages/user/index', }, ]; \ No newline at end of file diff --git a/custom-tab-bar/index.wxml b/custom-tab-bar/index.wxml index 384fd2f..5be390c 100644 --- a/custom-tab-bar/index.wxml +++ b/custom-tab-bar/index.wxml @@ -1,18 +1,8 @@ - - - - - {{ item.text }} - - - - + + + + + {{ item.text }} + + + \ No newline at end of file diff --git a/images/standard.jpg b/images/standard.jpg new file mode 100644 index 0000000000000000000000000000000000000000..35f977c3f3e4a9d76363a3c5c14ba27db4ff54fe GIT binary patch literal 39555 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 { + this.setData({ + addtiveList: respose.content.contentList, + "page.total": respose.content.total + }) + }) + }, + + doSearch(e) { + console.log(e); + const value = e.detail.value; + this.setData({ + "page.num": 1, + "searchValue": value + }) + this.getAddtiveList(); + }, + + onGoAdditive(event) { + const additiveId = event.currentTarget.dataset.additive; + wx.navigateTo({ + url: `/pages/home/additive/additive?additiveId=${additiveId}`, + }); + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + this.getTabBar().init(); + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/additive/list/additive-list.json b/pages/additive/list/additive-list.json new file mode 100644 index 0000000..c00b48a --- /dev/null +++ b/pages/additive/list/additive-list.json @@ -0,0 +1,12 @@ +{ + "navigationBarTitleText": "添加剂", + "onReachBottomDistance": 10, + "backgroundTextStyle": "light", + "usingComponents": { + "t-sticky": "tdesign-miniprogram/sticky/sticky", + "t-icon": "tdesign-miniprogram/icon/icon", + "t-cell": "tdesign-miniprogram/cell/cell", + "t-tag": "tdesign-miniprogram/tag/tag", + "t-search": "tdesign-miniprogram/search/search" + } +} \ No newline at end of file diff --git a/pages/additive/list/additive-list.wxml b/pages/additive/list/additive-list.wxml new file mode 100644 index 0000000..b635889 --- /dev/null +++ b/pages/additive/list/additive-list.wxml @@ -0,0 +1,17 @@ + + + + + + + + + + + {{item.name}} + {{item.enName}} + {{item.function}} + + + + \ No newline at end of file diff --git a/pages/additive/list/additive-list.wxss b/pages/additive/list/additive-list.wxss new file mode 100644 index 0000000..ab32d0a --- /dev/null +++ b/pages/additive/list/additive-list.wxss @@ -0,0 +1,21 @@ +/* pages/additive/list/additive-list.wxss */ + +.main { + padding: 10px; +} + +.list-view { + margin-bottom: 80px; +} + +.addtive-enname { + font-size: 0.875rem; + line-height: 1.25rem; + color: rgb(150, 150, 150); + margin-top: 5px; + margin-bottom: 5px; + white-space: nowrap; + overflow: hidden; + width: 250px; + text-overflow: clip; +} \ No newline at end of file diff --git a/pages/home/home.js b/pages/home/home.js index 9c3a8bb..f9d38d2 100644 --- a/pages/home/home.js +++ b/pages/home/home.js @@ -59,6 +59,7 @@ Page({ init() { this.loadHomePage(); + isLogin() }, loadHomePage() { @@ -170,9 +171,6 @@ Page({ // 上传图片 uploadPicture() { - if (!isLogin()) { - return - } wx.chooseMedia({ count: 1, mediaType: ['image'], diff --git a/pages/home/home.wxml b/pages/home/home.wxml index ed94acc..795c484 100644 --- a/pages/home/home.wxml +++ b/pages/home/home.wxml @@ -11,7 +11,7 @@ - + diff --git a/pages/home/session/session.js b/pages/home/session/session.js index 2cbfc58..f638e71 100644 --- a/pages/home/session/session.js +++ b/pages/home/session/session.js @@ -55,7 +55,7 @@ Page({ } }) sessionAdditiveQuery({ - id: this.sessionId + id: this.data.sessionId }).then(respose => { this.setData({ additives: respose.content.additives diff --git a/pages/standard/list/index.js b/pages/standard/list/index.js new file mode 100644 index 0000000..dfa0da7 --- /dev/null +++ b/pages/standard/list/index.js @@ -0,0 +1,109 @@ +// pages/standard/list/index.js + +import { + sessionStandardList +} from '../../../services/api/standard'; + +Page({ + + /** + * 页面的初始数据 + */ + data: { + searchValue: "", + standardList: [], + page: { + num: 1, + size: 20, + total: 0 + } + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + this.getStandardList(); + }, + + doSearch(e) { + const value = e.detail.value; + this.setData({ + "page.num": 1, + "searchValue": value + }) + this.getStandardList(); + }, + + doSearchClear(e) { + this.setData({ + "searchValue": '', + "standardList": [] + }) + }, + + getStandardList() { + const params = { + pageNumber: this.data.page.num, + pageSize: this.data.page.size + } + if (this.data.searchValue) { + params['search'] = this.data.searchValue + sessionStandardList(params).then(respose => { + this.setData({ + standardList: respose.content.contentList, + "page.total": respose.content.total + }) + }) + } + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + this.getTabBar().init(); + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/standard/list/index.json b/pages/standard/list/index.json new file mode 100644 index 0000000..c684cb9 --- /dev/null +++ b/pages/standard/list/index.json @@ -0,0 +1,8 @@ +{ + "usingComponents": { + "t-search": "tdesign-miniprogram/search/search", + "t-tag": "tdesign-miniprogram/tag/tag", + "t-check-tag": "tdesign-miniprogram/tag/check-tag", + "t-image": "tdesign-miniprogram/image/image" + } +} \ No newline at end of file diff --git a/pages/standard/list/index.wxml b/pages/standard/list/index.wxml new file mode 100644 index 0000000..f53ed4f --- /dev/null +++ b/pages/standard/list/index.wxml @@ -0,0 +1,20 @@ + + + + + + + + + + + + {{item.name}} + {{item.code}} + + {{item.public}} + {{item.status == 3 ? '过期' : '有效'}} + + + + \ No newline at end of file diff --git a/pages/standard/list/index.wxss b/pages/standard/list/index.wxss new file mode 100644 index 0000000..9fc4fd6 --- /dev/null +++ b/pages/standard/list/index.wxss @@ -0,0 +1,64 @@ +/* pages/standard/list/index.wxss */ + +.main { + padding: 10px; +} + +.top-empty { + width: 100%; + height: 150px; +} + +.search-view { + display: flex; + justify-content: center; +} + +.search { + width: 250px; +} + +.standard-image { + padding-top: 30px; + display: flex; + justify-content: center; +} + +.list-view { + margin: 10px; + margin-top: 20px; + margin-bottom: 80px; +} + +.standard-item { + --tw-shadow: 0 10px 15px -3px rgba(0, 0, 0, 0.1), 0 4px 6px -2px rgba(0, 0, 0, 0.05); + box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow); + border-style: solid; + border-width: 2px; + border-color: rgba(230, 230, 230, 0.719); + margin: 10px; + padding: 10px; + border-radius: 0.5rem; +} + +.standard-name { + font-weight: 600; +} + +.standard-code { + margin-top: 5px; + margin-left: 10px; + margin-bottom: 5px; + color: rgb(150, 150, 150); +} + +.standard-bottom { + display: flex; + justify-content: space-between; + align-items: center; +} + +.standard-public { + font-size: 0.875rem; + line-height: 1.25rem; +} \ No newline at end of file diff --git a/pages/user/index.js b/pages/user/index.js new file mode 100644 index 0000000..c07fd4c --- /dev/null +++ b/pages/user/index.js @@ -0,0 +1,73 @@ +// pages/user/index.js + +import { + isLogin +} from '../../services/permission/login'; + +Page({ + + /** + * 页面的初始数据 + */ + data: { + loginStatus: false, + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + this.setData({ + loginStatus: isLogin() + }) + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + this.getTabBar().init(); + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/user/index.json b/pages/user/index.json new file mode 100644 index 0000000..248787f --- /dev/null +++ b/pages/user/index.json @@ -0,0 +1,6 @@ +{ + "usingComponents": { + "t-image": "/components/webp-image/index", + "t-avatar": "tdesign-miniprogram/avatar/avatar" + } +} \ No newline at end of file diff --git a/pages/user/index.wxml b/pages/user/index.wxml new file mode 100644 index 0000000..7c77dd3 --- /dev/null +++ b/pages/user/index.wxml @@ -0,0 +1,9 @@ + + + + + {{ loginStatus ? '微信用户' :'请登录'}} + + + + \ No newline at end of file diff --git a/pages/user/index.wxss b/pages/user/index.wxss new file mode 100644 index 0000000..8be2647 --- /dev/null +++ b/pages/user/index.wxss @@ -0,0 +1,40 @@ +/* pages/user/index.wxss */ +.user-center-card { + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 480rpx; + background-image: url('https://cdn-we-retail.ym.tencent.com/miniapp/template/user-center-bg-v1.png'); + background-size: cover; + background-repeat: no-repeat; + padding: 0 24rpx; +} + +.searich_btn { + margin-top: 192rpx; + margin-bottom: 48rpx; + height: 96rpx; + line-height: 48rpx; + display: flex; + justify-content: flex-start; + align-items: center; + color: #333; + position: relative; +} + +.user-center-card__header__avatar { + width: 96rpx; + height: 96rpx; + border-radius: 48rpx; + overflow: hidden; +} + +.user-center-card__header__name { + font-size: 36rpx; + line-height: 48rpx; + color: #333; + font-weight: bold; + margin-left: 24rpx; + margin-right: 16rpx; +} \ No newline at end of file diff --git a/pages/usercenter/index.wxml b/pages/usercenter/index.wxml index d71686d..0955e31 100644 --- a/pages/usercenter/index.wxml +++ b/pages/usercenter/index.wxml @@ -1,17 +1,9 @@ - + - - - - + + 当前版本 {{versionNo}} - - - - 服务时间: {{customerServiceInfo.serviceTimeDuration}} - - 电话客服 - - 取消 - + + + + 服务时间: {{customerServiceInfo.serviceTimeDuration}} + + 电话客服 + + 取消 + - - + \ No newline at end of file diff --git a/services/api/additive.js b/services/api/additive.js new file mode 100644 index 0000000..c63fe2b --- /dev/null +++ b/services/api/additive.js @@ -0,0 +1,11 @@ +import { + request +} from './request' + +export function sessionAdditiveList(params) { + return request({ + path: '/additive/list', + params: params, + method: 'GET' + }); +} \ No newline at end of file diff --git a/services/api/standard.js b/services/api/standard.js new file mode 100644 index 0000000..60db8bd --- /dev/null +++ b/services/api/standard.js @@ -0,0 +1,11 @@ +import { + request +} from './request' + +export function sessionStandardList(params) { + return request({ + path: '/standard/list', + params: params, + method: 'GET' + }); +} \ No newline at end of file