完成添加剂列表，标准查询

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": "我的"
       }
     ]

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',
   },
 ];

custom-tab-bar/index.wxml

@@ -1,18 +1,8 @@
-<t-tab-bar
- value="{{active}}"
- bindchange="onChange"
- split="{{false}}"
->
-	<t-tab-bar-item
-	 wx:for="{{list}}"
-	 wx:for-item="item"
-	 wx:for-index="index"
-	 wx:key="index"
-	>
+<t-tab-bar value="{{active}}" bindchange="onChange" split="{{false}}">
+  <t-tab-bar-item wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index">
     <view class="custom-tab-bar-wrapper">
-			<t-icon prefix="wr" name="{{item.icon}}" size="48rpx" />
+      <t-icon prefix="wr" name="{{item.icon}}" data-name="{{item.icon}}" size="48rpx" />
       <view class="text">{{ item.text }}</view>
     </view>
   </t-tab-bar-item>
 </t-tab-bar>
-

pages/additive/list/additive-list.js

@@ -0,0 +1,111 @@
+// pages/additive/list/additive-list.js
+
+import {
+  sessionAdditiveList
+} from '../../../services/api/additive';
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    searchValue: "",
+    addtiveList: [],
+    page: {
+      num: 1,
+      size: 20,
+      total: 0
+    }
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    this.getAddtiveList();
+  },
+
+  getAddtiveList() {
+    console.log(this.data.searchValue);
+    const params = {
+      pageNumber: this.data.page.num,
+      pageSize: this.data.page.size
+    }
+    if (this.data.searchValue) {
+      params['search'] = this.data.searchValue
+    }
+    sessionAdditiveList(params).then(respose => {
+      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() {
+
+  }
+})

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"
+  }
+}

pages/additive/list/additive-list.wxml

@@ -0,0 +1,17 @@
+<!--pages/additive/list/additive-list.wxml-->
+<view class="main">
+  <t-sticky>
+    <t-search t-class="t-search" t-class-input-container="t-class__input-container" t-class-left="t-search__left-icon" t-class-input="t-search__input" leftIcon="" rightIcon="" placeholder="请输入添加剂信息" bind:submit="doSearch" value="{{searchValue}}">
+      <t-icon slot="left-icon" prefix="wr" name="search" size="40rpx" color="#bbb" />
+    </t-search>
+  </t-sticky>
+  <view class="list-view">
+    <t-cell wx:for="{{addtiveList}}" wx:key="index" wx:for-item="item" hover arrow data-additive="{{item.id}}" bindtap="onGoAdditive">
+      <view slot="title">
+        <view>{{item.name}}</view>
+        <view class="addtive-enname">{{item.enName}}</view>
+        <view class="addtive-enname">{{item.function}}</view>
+      </view>
+    </t-cell>
+  </view>
+</view>

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;
+}

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'],

pages/home/home.wxml

@@ -11,7 +11,7 @@
   <!-- <t-button bindtap="textButton"></t-button> -->
   <t-image t-class="searich_btn" shape="round" mode="heightFix" src="/images/search.jpg" bind:tap="uploadPicture" />
 </view>
-<view class="home-page-ad"></view>
+<!-- <view class="home-page-ad"></view> -->
 <t-dialog visible="{{loadingDialog}}" cancel-btn="取消操作" bind:cancel="onCloseDialog">
   <view slot="content">
     <t-loading t-class="dialog-content" theme="circular" size="200rpx" class="large" />

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

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() {
+
+  }
+})

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"
+  }
+}

pages/standard/list/index.wxml

@@ -0,0 +1,20 @@
+<!--pages/standard/list/index.wxml-->
+<view class="main">
+  <view wx:if="{{standardList.length == 0}}" class="top-empty"></view>
+  <view class="search-view">
+    <t-search t-class="search" placeholder="搜索标准" shape="round" bind:submit="doSearch" bind:clear="doSearchClear" value="{{searchValue}}" />
+  </view>
+  <view wx:if="{{standardList.length == 0}}" class="standard-image">
+    <t-image shape="round" mode="heightFix" src="/images/standard.jpg" bind:tap="uploadPicture" />
+  </view>
+  <view class="list-view">
+    <view class="standard-item" wx:for="{{standardList}}" wx:key="index" wx:for-item="item">
+      <view class="standard-name">{{item.name}}</view>
+      <view class="standard-code">{{item.code}}</view>
+      <view class="standard-bottom">
+        <view class="standard-public">{{item.public}}</view>
+        <t-tag variant="light" theme="{{item.status == 3 ? 'warning' : 'success'}}">{{item.status == 3 ? '过期' : '有效'}}</t-tag>
+      </view>
+    </view>
+  </view>
+</view>

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;
+}

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() {
+
+  }
+})

pages/user/index.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "t-image": "/components/webp-image/index",
+    "t-avatar": "tdesign-miniprogram/avatar/avatar"
+  }
+}

pages/user/index.wxml

@@ -0,0 +1,9 @@
+<!--pages/user/index.wxml-->
+<view class="user-center-card">
+  <view class="searich_btn">
+    <t-avatar image="/images/weixin.png" class="user-center-card__header__avatar" />
+    <view class="user-center-card__header__name">{{ loginStatus ? '微信用户' :'请登录'}}</view>
+  </view>
+</view>
+
+<view></view>

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;
+}

pages/usercenter/index.wxml

@@ -1,17 +1,9 @@
-<t-user-center-card
-  userInfo="{{userInfo}}"
-  isPhoneHide="{{true}}"
-  name-class="custom-name-class"
-  phone-class="custom-phone-class"
-  avatar-class="custome-avatar-class"
-  currAuthStep="{{currAuthStep}}"
-  bind:gotoUserEditPage="gotoUserEditPage"
-/>
+<t-user-center-card userInfo="{{userInfo}}" isPhoneHide="{{true}}" name-class="custom-name-class" phone-class="custom-phone-class" avatar-class="custome-avatar-class" currAuthStep="{{currAuthStep}}" bind:gotoUserEditPage="gotoUserEditPage" />
 <view class="content-wrapper">
-	<view class='order-group-wrapper'>
+  <!-- <view class='order-group-wrapper'>
     <t-order-group orderTagInfos="{{orderTagInfos}}" bind:onClickTop="jumpAllOrder" bind:onClickItem="jumpNav" />
-	</view>
-	<view wx:for="{{menuData}}" wx:key="item" class="cell-box">
+  </view> -->
+  <!-- <view wx:for="{{menuData}}" wx:key="item" class="cell-box">
 		<t-cell-group>
 			<t-cell
 			  wx:for="{{item}}"
@@ -31,15 +23,10 @@
 				<t-icon name="{{xitem.icon}}" size="48rpx" slot="note" />
 			</t-cell>
 		</t-cell-group>
-	</view>
+	</view> -->
 </view>
 <view class="footer__version" wx:if="{{versionNo !== ''}}">当前版本 {{versionNo}}</view>
-<t-popup
-  visible="{{showMakePhone}}"
-  placement="bottom"
-  bind:visible-change="closeMakePhone"
-  data-index="2"
->
+<t-popup visible="{{showMakePhone}}" placement="bottom" bind:visible-change="closeMakePhone" data-index="2">
   <view class="popup-content">
     <view class="popup-title border-bottom-1px" wx:if="{{customerServiceInfo.serviceTimeDuration}}">
       服务时间: {{customerServiceInfo.serviceTimeDuration}}
@@ -50,4 +37,3 @@
   </view>
 </t-popup>
 <t-toast id="t-toast" />
-

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'
+  });
+}

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'
+  });
+}