Browse Source

页面分包

viczhq 3 weeks ago
parent
commit
cddf742c29
54 changed files with 104 additions and 112 deletions
  1. 2 1
      project.config.json
  2. 1 1
      project.private.config.json
  3. 25 16
      src/app.config.js
  4. 2 1
      src/components/ProductCard/index.jsx
  5. 1 1
      src/components/index/OperationArea/index.jsx
  6. 4 1
      src/components/index/ProductList/index.jsx
  7. 2 1
      src/components/index/RecommendList/index.jsx
  8. 1 0
      src/pages/index/index.jsx
  9. 0 0
      src/pages/indexSub/productDetail/index.config.js
  10. 7 7
      src/pages/productDetail/index.jsx
  11. 0 0
      src/pages/indexSub/productDetail/index.less
  12. 0 0
      src/pages/indexSub/seckillIndex/index.config.js
  13. 2 11
      src/pages/seckillIndex/index.jsx
  14. 0 0
      src/pages/indexSub/seckillIndex/index.less
  15. 5 5
      src/pages/member/index.jsx
  16. 8 5
      src/pages/member/index.less
  17. 0 0
      src/pages/memberSub/Alipay/index.config.js
  18. 2 1
      src/pages/Alipay/index.jsx
  19. 0 0
      src/pages/memberSub/Alipay/index.less
  20. 0 0
      src/pages/memberSub/cashOut/index.config.js
  21. 9 6
      src/pages/cashOut/index.jsx
  22. 5 1
      src/pages/cashOut/index.less
  23. 0 0
      src/pages/memberSub/cashOutRecord/index.config.js
  24. 1 1
      src/pages/cashOutRecord/index.jsx
  25. 0 0
      src/pages/memberSub/cashOutRecord/index.less
  26. 0 0
      src/pages/memberSub/earningsDetail/index.config.js
  27. 0 0
      src/pages/memberSub/earningsDetail/index.jsx
  28. 0 0
      src/pages/memberSub/earningsDetail/index.less
  29. 0 0
      src/pages/memberSub/earningsOrder/index.config.js
  30. 2 2
      src/pages/earningsOrder/index.jsx
  31. 0 0
      src/pages/memberSub/earningsOrder/index.less
  32. 0 0
      src/pages/memberSub/productClassify/index.config.js
  33. 2 2
      src/pages/productClassify/index.jsx
  34. 0 0
      src/pages/memberSub/productClassify/index.less
  35. 0 0
      src/pages/memberSub/productManagement/index.config.js
  36. 8 8
      src/pages/productManagement/index.jsx
  37. 0 0
      src/pages/memberSub/productManagement/index.less
  38. 0 0
      src/pages/memberSub/statementRecords/index.config.js
  39. 1 1
      src/pages/statementRecords/index.jsx
  40. 0 0
      src/pages/memberSub/statementRecords/index.less
  41. 0 0
      src/pages/memberSub/storeManagement/index.config.js
  42. 4 4
      src/pages/storeManagement/index.jsx
  43. 0 0
      src/pages/memberSub/storeManagement/index.less
  44. 5 3
      src/pages/mine/index.jsx
  45. 5 1
      src/pages/mine/index.less
  46. 0 0
      src/pages/mineSub/infoEdit/index.config.js
  47. 0 0
      src/pages/mineSub/infoEdit/index.jsx
  48. 0 0
      src/pages/mineSub/infoEdit/index.less
  49. 0 0
      src/pages/mineSub/userSpecification/index.config.js
  50. 0 0
      src/pages/mineSub/userSpecification/index.jsx
  51. 0 0
      src/pages/mineSub/userSpecification/index.less
  52. 0 3
      src/pages/productSub/infoEdit/index.config.js
  53. 0 25
      src/pages/productSub/infoEdit/index.jsx
  54. 0 4
      src/pages/productSub/infoEdit/index.less

+ 2 - 1
project.config.json

@@ -12,7 +12,8 @@
12
       "ignore": [],
12
       "ignore": [],
13
       "disablePlugins": [],
13
       "disablePlugins": [],
14
       "outputPath": ""
14
       "outputPath": ""
15
-    }
15
+    },
16
+    "minifyWXSS": true
16
   },
17
   },
17
   "compileType": "miniprogram",
18
   "compileType": "miniprogram",
18
   "libVersion": "2.26.0",
19
   "libVersion": "2.26.0",

+ 1 - 1
project.private.config.json

@@ -2,7 +2,7 @@
2
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
2
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
3
   "projectname": "%E9%B1%BC%E5%B8%82",
3
   "projectname": "%E9%B1%BC%E5%B8%82",
4
   "setting": {
4
   "setting": {
5
-    "compileHotReLoad": true
5
+    "compileHotReLoad": false
6
   },
6
   },
7
   "libVersion": "3.6.4",
7
   "libVersion": "3.6.4",
8
   "condition": {
8
   "condition": {

+ 25 - 16
src/app.config.js

@@ -3,26 +3,35 @@ export default defineAppConfig({
3
   pages: [
3
   pages: [
4
     'pages/index/index',
4
     'pages/index/index',
5
     'pages/member/index',
5
     'pages/member/index',
6
-    "pages/mine/index",
7
-    "pages/seckillIndex/index",
8
-    "pages/productDetail/index",
9
-    "pages/storeManagement/index",
10
-    "pages/productManagement/index",
11
-    "pages/productClassify/index",
12
-    "pages/earningsDetail/index",
13
-    "pages/earningsOrder/index",
14
-    "pages/infoEdit/index",
15
-    "pages/userSpecification/index",
16
-    "pages/cashOut/index",
17
-    "pages/cashOutRecord/index",
18
-    "pages/statementRecords/index",
19
-    "pages/Alipay/index"
6
+    "pages/mine/index"
20
   ],
7
   ],
21
   subpackages: [
8
   subpackages: [
22
     {
9
     {
23
-      root: "pages/productSub",
10
+      root: "pages/indexSub",
24
       pages: [
11
       pages: [
25
-        "infoEdit/index"
12
+        "productDetail/index",
13
+        "seckillIndex/index"
14
+      ]
15
+    },
16
+    {
17
+      root: "pages/memberSub",
18
+      pages: [
19
+        "storeManagement/index",
20
+        "productManagement/index",
21
+        "productClassify/index",
22
+        "earningsDetail/index",
23
+        "earningsOrder/index",
24
+        "cashOut/index",
25
+        "cashOutRecord/index",
26
+        "statementRecords/index",
27
+        "Alipay/index"
28
+      ]
29
+    },
30
+    {
31
+      root: "pages/mineSub",
32
+      pages: [
33
+        "infoEdit/index",
34
+        "userSpecification/index",
26
       ]
35
       ]
27
     },
36
     },
28
   ],
37
   ],

+ 2 - 1
src/components/ProductCard/index.jsx

@@ -1,9 +1,10 @@
1
 import { View, Text, Image } from '@tarojs/components'
1
 import { View, Text, Image } from '@tarojs/components'
2
+import Taro from '@tarojs/taro'
2
 import './index.less'
3
 import './index.less'
3
 
4
 
4
 const ProductCard = ({ product }) => {
5
 const ProductCard = ({ product }) => {
5
   return (
6
   return (
6
-    <View className='product-card'>
7
+    <View onClick={() => Taro.navigateTo({ url: `/pages/indexSub/productDetail/index?id=${product.id}` })} className='product-card'>
7
       <Image className='product-img' src={product.imageUrl} mode='widthFix' />
8
       <Image className='product-img' src={product.imageUrl} mode='widthFix' />
8
       <View className='product-content'>
9
       <View className='product-content'>
9
         <Text className='title'>{product.name}</Text>
10
         <Text className='title'>{product.name}</Text>

+ 1 - 1
src/components/index/OperationArea/index.jsx

@@ -32,7 +32,7 @@ const OperationArea = () => {
32
   const handleNavigate = (type) => {
32
   const handleNavigate = (type) => {
33
     if (type === 'seckill') {
33
     if (type === 'seckill') {
34
       Taro.navigateTo({
34
       Taro.navigateTo({
35
-        url: '/pages/seckillIndex/index'
35
+        url: '/pages/indexSub/seckillIndex/index'
36
       });
36
       });
37
     } else if (type === 'highCommission') {
37
     } else if (type === 'highCommission') {
38
 
38
 

+ 4 - 1
src/components/index/ProductList/index.jsx

@@ -11,6 +11,7 @@ const ProductList = (props) => {
11
   const { isSeckill } = props; //是否是秒杀产品引用
11
   const { isSeckill } = props; //是否是秒杀产品引用
12
   const { isManagement } = props; //是否是管理产品引用
12
   const { isManagement } = props; //是否是管理产品引用
13
   const { isManagementStatus } = props; //是否是管理状态引用
13
   const { isManagementStatus } = props; //是否是管理状态引用
14
+  const { isProductClassify } = props; //是否是分类产品引用
14
   const { isSelectAll } = props; //是否是全选
15
   const { isSelectAll } = props; //是否是全选
15
   const [selectedProducts, setSelectedProducts] = useState([]); // 管理选中的商品列表
16
   const [selectedProducts, setSelectedProducts] = useState([]); // 管理选中的商品列表
16
   // 模拟商品数据
17
   // 模拟商品数据
@@ -50,9 +51,11 @@ const ProductList = (props) => {
50
   const toDetail = (id) => {
51
   const toDetail = (id) => {
51
     if (isManagementStatus) {
52
     if (isManagementStatus) {
52
       selectProduct(id);
53
       selectProduct(id);
54
+    } else if (isProductClassify) {
55
+      return;
53
     } else {
56
     } else {
54
       Taro.navigateTo({
57
       Taro.navigateTo({
55
-        url: `/pages/productDetail/index?id=${id}`,
58
+        url: `/pages/indexSub/productDetail/index?id=${id}`,
56
       });
59
       });
57
     }
60
     }
58
   };
61
   };

+ 2 - 1
src/components/index/RecommendList/index.jsx

@@ -1,6 +1,7 @@
1
 import { View, Text, Swiper, SwiperItem, Image } from "@tarojs/components";
1
 import { View, Text, Swiper, SwiperItem, Image } from "@tarojs/components";
2
 import recommendBg1 from '../../../images/index/recommend-bg1.png'
2
 import recommendBg1 from '../../../images/index/recommend-bg1.png'
3
 import recommendBg2 from '../../../images/index/recommend-bg2.png'
3
 import recommendBg2 from '../../../images/index/recommend-bg2.png'
4
+import Taro from '@tarojs/taro'
4
 import "./index.less";
5
 import "./index.less";
5
 
6
 
6
 const RecommendList = () => {
7
 const RecommendList = () => {
@@ -73,7 +74,7 @@ const RecommendList = () => {
73
           <SwiperItem key={groupIndex} className="swiper-item">
74
           <SwiperItem key={groupIndex} className="swiper-item">
74
             <View className="product-group">
75
             <View className="product-group">
75
               {group.map(product => (
76
               {group.map(product => (
76
-                <View key={product.id} className="product-item">
77
+                <View onClick={() => Taro.navigateTo({ url: `/pages/indexSub/productDetail/index?id=${product.id}` })} key={product.id} className="product-item">
77
                   <Image className="product-img" src={product.image} mode="aspectFill" />
78
                   <Image className="product-img" src={product.image} mode="aspectFill" />
78
                   <Text className="product-name">{product.name}</Text>
79
                   <Text className="product-name">{product.name}</Text>
79
                   <View className="price-info">
80
                   <View className="price-info">

+ 1 - 0
src/pages/index/index.jsx

@@ -147,6 +147,7 @@ export default class Index extends Component {
147
         <View className="float-buttons">
147
         <View className="float-buttons">
148
           <View
148
           <View
149
             className="float-btn"
149
             className="float-btn"
150
+            onClick={()=>Taro.navigateTo({url:"/pages/memberSub/storeManagement/index"})}
150
           >
151
           >
151
             <Image
152
             <Image
152
               className="my-shop-bg"
153
               className="my-shop-bg"

src/pages/productDetail/index.config.js → src/pages/indexSub/productDetail/index.config.js


+ 7 - 7
src/pages/productDetail/index.jsx

@@ -3,13 +3,13 @@ import { View, Text, Swiper, SwiperItem, Image } from "@tarojs/components";
3
 import { AtIcon } from "taro-ui";
3
 import { AtIcon } from "taro-ui";
4
 import "./index.less";
4
 import "./index.less";
5
 import Taro from "@tarojs/taro";
5
 import Taro from "@tarojs/taro";
6
-import productDetailIcon from "../../images/productDetail/productDetailIcon.png";
7
-import like from "../../images/productDetail/like.png";
8
-import home from "../../images/nav/home.png";
9
-import selfBuy from "../../images/productDetail/selfBuy.png";
10
-import share from "../../images/productDetail/share.png";
11
-import ProductCard from "../../components/ProductCard"; //产品卡片
12
-import Modal from "../../components/Modal"; //弹窗
6
+import productDetailIcon from "../../../images/productDetail/productDetailIcon.png";
7
+import like from "../../../images/productDetail/like.png";
8
+import home from "../../../images/nav/home.png";
9
+import selfBuy from "../../../images/productDetail/selfBuy.png";
10
+import share from "../../../images/productDetail/share.png";
11
+import ProductCard from "../../../components/ProductCard"; //产品卡片
12
+import Modal from "../../../components/Modal"; //弹窗
13
 
13
 
14
 export default class Index extends Component {
14
 export default class Index extends Component {
15
   state = {
15
   state = {

src/pages/productDetail/index.less → src/pages/indexSub/productDetail/index.less


src/pages/seckillIndex/index.config.js → src/pages/indexSub/seckillIndex/index.config.js


+ 2 - 11
src/pages/seckillIndex/index.jsx

@@ -1,18 +1,9 @@
1
 import { Component } from "react";
1
 import { Component } from "react";
2
 import { View, Image } from "@tarojs/components";
2
 import { View, Image } from "@tarojs/components";
3
 import "./index.less";
3
 import "./index.less";
4
-import seckillImg from "../../images/seckill/seckillTop.png";
5
-import ProductList from "../../components/index/ProductList";
4
+import seckillImg from "../../../images/seckill/seckillTop.png";
5
+import ProductList from "../../../components/index/ProductList";
6
 export default class Index extends Component {
6
 export default class Index extends Component {
7
-  componentWillMount() {}
8
-
9
-  componentDidMount() {}
10
-
11
-  componentWillUnmount() {}
12
-
13
-  componentDidShow() {}
14
-
15
-  componentDidHide() {}
16
 
7
 
17
   render() {
8
   render() {
18
     return (
9
     return (

src/pages/seckillIndex/index.less → src/pages/indexSub/seckillIndex/index.less


+ 5 - 5
src/pages/member/index.jsx

@@ -38,9 +38,9 @@ export default class Index extends Component {
38
               </View>
38
               </View>
39
             </View>
39
             </View>
40
             {/* 我的小店 */}
40
             {/* 我的小店 */}
41
-            <View onClick={() => Taro.navigateTo({ url: `/pages/storeManagement/index?isManager=${true}` })} className="my-shop">
41
+            <View onClick={() => Taro.navigateTo({ url: `/pages/memberSub/storeManagement/index?isManager=${true}` })} className="my-shop">
42
               <Image className="my-shop-icon" src={home} />
42
               <Image className="my-shop-icon" src={home} />
43
-              <Text className="my-shop-text">我的小店</Text>
43
+              <View className="my-shop-text">我的小店</View>
44
             </View>
44
             </View>
45
           </View>
45
           </View>
46
           {/* 预估收益 */}
46
           {/* 预估收益 */}
@@ -57,7 +57,7 @@ export default class Index extends Component {
57
                 <Text className="label">累计收益</Text>
57
                 <Text className="label">累计收益</Text>
58
               </View>
58
               </View>
59
             </View>
59
             </View>
60
-            <view onClick={() => Taro.navigateTo({ url: `/pages/earningsDetail/index` })} className="estimated-income-detail">
60
+            <view onClick={() => Taro.navigateTo({ url: `/pages/memberSub/earningsDetail/index` })} className="estimated-income-detail">
61
               收益详情
61
               收益详情
62
               <Image className="to-detail" src={toDetail} />
62
               <Image className="to-detail" src={toDetail} />
63
             </view>
63
             </view>
@@ -76,7 +76,7 @@ export default class Index extends Component {
76
                   <Text className="warning-text">未完成提现认证</Text>
76
                   <Text className="warning-text">未完成提现认证</Text>
77
                 </View>
77
                 </View>
78
               </View>
78
               </View>
79
-              <View className="right">点击提现</View>
79
+              <View onClick={() => Taro.navigateTo({ url: `/pages/memberSub/cashOut/index` })} className="right">点击提现</View>
80
             </View>
80
             </View>
81
           </View>
81
           </View>
82
           {/* 今日订单 */}
82
           {/* 今日订单 */}
@@ -86,7 +86,7 @@ export default class Index extends Component {
86
                 <Image className="today-order-icon" src={order} />
86
                 <Image className="today-order-icon" src={order} />
87
                 <Text className="today-order-title">今日订单</Text>
87
                 <Text className="today-order-title">今日订单</Text>
88
               </View>
88
               </View>
89
-              <View className="today-order-header-right">
89
+              <View onClick={() => Taro.navigateTo({ url: `/pages/memberSub/earningsOrder/index` })} className="today-order-header-right">
90
                 历史订单
90
                 历史订单
91
                 <AtIcon value='chevron-right' size='10' color='#A1A1A1'></AtIcon>
91
                 <AtIcon value='chevron-right' size='10' color='#A1A1A1'></AtIcon>
92
               </View>
92
               </View>

+ 8 - 5
src/pages/member/index.less

@@ -2,7 +2,7 @@
2
     position: relative;
2
     position: relative;
3
     min-height: 100vh;
3
     min-height: 100vh;
4
     background-color: #f9f9f9;
4
     background-color: #f9f9f9;
5
-
5
+    padding-bottom: 30px;
6
     .member-bg {
6
     .member-bg {
7
         position: absolute;
7
         position: absolute;
8
         top: 0;
8
         top: 0;
@@ -96,10 +96,13 @@
96
                 margin-right: 10px;
96
                 margin-right: 10px;
97
             }
97
             }
98
 
98
 
99
-            text {
99
+            .my-shop-text {
100
                 font-size: 24px;
100
                 font-size: 24px;
101
-                line-height: 40px;
102
                 color: #000000;
101
                 color: #000000;
102
+                height: 100%;
103
+                display: flex;
104
+                align-items: center;
105
+                padding-top: 10px;
103
             }
106
             }
104
         }
107
         }
105
     }
108
     }
@@ -229,9 +232,9 @@
229
                         line-height: 40px;
232
                         line-height: 40px;
230
                     }
233
                     }
231
                     .warning-icon {
234
                     .warning-icon {
232
-                        width: 24px;
235
+                        width: 26px;
233
                         height: 24px;
236
                         height: 24px;
234
-                        margin-right: 10px;
237
+                        margin-right: 16px;
235
                     }
238
                     }
236
                 }
239
                 }
237
             }
240
             }

src/pages/Alipay/index.config.js → src/pages/memberSub/Alipay/index.config.js


+ 2 - 1
src/pages/Alipay/index.jsx

@@ -2,7 +2,7 @@ import { Component } from "react";
2
 import { View, Text, Image } from "@tarojs/components";
2
 import { View, Text, Image } from "@tarojs/components";
3
 import { AtInput } from "taro-ui";
3
 import { AtInput } from "taro-ui";
4
 import "./index.less";
4
 import "./index.less";
5
-import aliPayIcon from "../../images/aliPayIcon.png";
5
+import aliPayIcon from "../../../images/aliPayIcon.png";
6
 export default class Index extends Component {
6
 export default class Index extends Component {
7
   state = {
7
   state = {
8
     name: "", // 账户姓名
8
     name: "", // 账户姓名
@@ -29,6 +29,7 @@ export default class Index extends Component {
29
             onChange={this.handleChangeName.bind(this)}
29
             onChange={this.handleChangeName.bind(this)}
30
           />
30
           />
31
           <AtInput
31
           <AtInput
32
+          border={false}  
32
             name="value"
33
             name="value"
33
             title="支付宝账户"
34
             title="支付宝账户"
34
             type="text"
35
             type="text"

src/pages/Alipay/index.less → src/pages/memberSub/Alipay/index.less


src/pages/cashOut/index.config.js → src/pages/memberSub/cashOut/index.config.js


+ 9 - 6
src/pages/cashOut/index.jsx

@@ -2,7 +2,7 @@ import { Component } from 'react'
2
 import { View, Text } from '@tarojs/components'
2
 import { View, Text } from '@tarojs/components'
3
 import { AtList, AtListItem } from "taro-ui"
3
 import { AtList, AtListItem } from "taro-ui"
4
 import './index.less'
4
 import './index.less'
5
-
5
+import Taro from '@tarojs/taro'
6
 export default class Index extends Component {
6
 export default class Index extends Component {
7
 
7
 
8
   render () {
8
   render () {
@@ -25,11 +25,14 @@ export default class Index extends Component {
25
       </View>
25
       </View>
26
       {/* 提现功能 */}
26
       {/* 提现功能 */}
27
       <View className='cash-out-function'>
27
       <View className='cash-out-function'>
28
-        <AtList>
29
-        <AtListItem title='提现认证' extraText='认证审核中' arrow='right' />
30
-        <AtListItem title='标题记录' extraText='' arrow='right' />
31
-        <AtListItem title='支付账户' extraText='需维护支付宝账户信息' arrow='right' />
32
-        <AtListItem title='标题结算单记录' extraText='6月结算单已出' arrow='right' />
28
+        <AtList hasBorder={false}>
29
+        <AtListItem hasBorder={false} onClick={() => Taro.navigateTo({ url: `/pages/memberSub/Alipay/index` })} title='提现认证' extraText='认证审核中' arrow='right' />
30
+        <View className='line'></View>
31
+        <AtListItem hasBorder={false} onClick={() => Taro.navigateTo({ url: `/pages/memberSub/cashOutRecord/index` })} title='提现记录' extraText='' arrow='right' />
32
+        <View className='line'></View>
33
+        <AtListItem hasBorder={false} title='支付账户' extraText='需维护支付宝账户信息' arrow='right' />
34
+        <View className='line'></View>
35
+        <AtListItem hasBorder={false} onClick={() => Taro.navigateTo({ url: `/pages/memberSub/statementRecords/index` })} title='标题结算单记录' extraText='6月结算单已出' arrow='right' />
33
         </AtList>
36
         </AtList>
34
       </View>
37
       </View>
35
       {/* 结算单说明 */}
38
       {/* 结算单说明 */}

+ 5 - 1
src/pages/cashOut/index.less

@@ -65,7 +65,11 @@
65
     border-radius: 20px;
65
     border-radius: 20px;
66
     background-color: #fff;
66
     background-color: #fff;
67
     overflow: hidden;
67
     overflow: hidden;
68
-
68
+    .line{
69
+        margin: 0 17px;
70
+        height: 1px;
71
+        background-color: #D8D8D8;
72
+    }
69
     .item-content__info-title {
73
     .item-content__info-title {
70
         font-weight: 500;
74
         font-weight: 500;
71
         font-size: 28px;
75
         font-size: 28px;

src/pages/cashOutRecord/index.config.js → src/pages/memberSub/cashOutRecord/index.config.js


+ 1 - 1
src/pages/cashOutRecord/index.jsx

@@ -1,7 +1,7 @@
1
 import { Component } from 'react'
1
 import { Component } from 'react'
2
 import { View, Text, Image } from '@tarojs/components'
2
 import { View, Text, Image } from '@tarojs/components'
3
 import './index.less'
3
 import './index.less'
4
-import wallet from '../../images/wallet.png'
4
+import wallet from '../../../images/wallet.png'
5
 export default class Index extends Component {
5
 export default class Index extends Component {
6
 
6
 
7
   componentWillMount () { }
7
   componentWillMount () { }

src/pages/cashOutRecord/index.less → src/pages/memberSub/cashOutRecord/index.less


src/pages/earningsDetail/index.config.js → src/pages/memberSub/earningsDetail/index.config.js


src/pages/earningsDetail/index.jsx → src/pages/memberSub/earningsDetail/index.jsx


src/pages/earningsDetail/index.less → src/pages/memberSub/earningsDetail/index.less


src/pages/earningsOrder/index.config.js → src/pages/memberSub/earningsOrder/index.config.js


+ 2 - 2
src/pages/earningsOrder/index.jsx

@@ -2,8 +2,8 @@ import { Component } from "react";
2
 import { View, Text, Image, Picker } from "@tarojs/components";
2
 import { View, Text, Image, Picker } from "@tarojs/components";
3
 import { AtDivider } from "taro-ui";
3
 import { AtDivider } from "taro-ui";
4
 import "./index.less";
4
 import "./index.less";
5
-import selectIcon from "../../images/productManagement/selectIcon.png";
6
-import vip from "../../images/earningsOrder/vip.png";
5
+import selectIcon from "../../../images/productManagement/selectIcon.png";
6
+import vip from "../../../images/earningsOrder/vip.png";
7
 import Taro from "@tarojs/taro";
7
 import Taro from "@tarojs/taro";
8
 
8
 
9
 export default class Index extends Component {
9
 export default class Index extends Component {

src/pages/earningsOrder/index.less → src/pages/memberSub/earningsOrder/index.less


src/pages/productClassify/index.config.js → src/pages/memberSub/productClassify/index.config.js


+ 2 - 2
src/pages/productClassify/index.jsx

@@ -3,7 +3,7 @@ import { View, Text } from "@tarojs/components";
3
 import { AtTabs, AtTabsPane } from "taro-ui";
3
 import { AtTabs, AtTabsPane } from "taro-ui";
4
 import "./index.less";
4
 import "./index.less";
5
 import Taro from "@tarojs/taro";
5
 import Taro from "@tarojs/taro";
6
-import ProductList from '../../components/index/ProductList'
6
+import ProductList from '../../../components/index/ProductList'
7
 
7
 
8
 export default class Index extends Component {
8
 export default class Index extends Component {
9
   state = {
9
   state = {
@@ -31,7 +31,7 @@ export default class Index extends Component {
31
           {this.state.tabList.map((tab, index) => (
31
           {this.state.tabList.map((tab, index) => (
32
             <AtTabsPane current={this.state.current} index={index} key={index}>
32
             <AtTabsPane current={this.state.current} index={index} key={index}>
33
               <View className="tab-content">
33
               <View className="tab-content">
34
-                <ProductList />
34
+                <ProductList isProductClassify={true} />
35
               </View>
35
               </View>
36
             </AtTabsPane>
36
             </AtTabsPane>
37
           ))}
37
           ))}

src/pages/productClassify/index.less → src/pages/memberSub/productClassify/index.less


src/pages/productManagement/index.config.js → src/pages/memberSub/productManagement/index.config.js


+ 8 - 8
src/pages/productManagement/index.jsx

@@ -3,13 +3,13 @@ import { View, Picker, Image, Text } from "@tarojs/components";
3
 import { AtTabs, AtTabsPane, AtCheckbox } from "taro-ui";
3
 import { AtTabs, AtTabsPane, AtCheckbox } from "taro-ui";
4
 import Taro from "@tarojs/taro";
4
 import Taro from "@tarojs/taro";
5
 import "./index.less";
5
 import "./index.less";
6
-import ProductList from "../../components/index/ProductList"; //商品列表
7
-import add from "../../images/productManagement/add.png";
8
-import back from "../../images/productManagement/back.png";
9
-import manger from "../../images/productManagement/manger.png";
10
-import selectIcon from "../../images/productManagement/selectIcon.png";
11
-import deleteIcon from "../../images/productManagement/delete.png";
12
-import toTop from "../../images/productManagement/toTop.png";
6
+import ProductList from "../../../components/index/ProductList"; //商品列表
7
+import add from "../../../images/productManagement/add.png";
8
+import back from "../../../images/productManagement/back.png";
9
+import manger from "../../../images/productManagement/manger.png";
10
+import selectIcon from "../../../images/productManagement/selectIcon.png";
11
+import deleteIcon from "../../../images/productManagement/delete.png";
12
+import toTop from "../../../images/productManagement/toTop.png";
13
 export default class Index extends Component {
13
 export default class Index extends Component {
14
   state = {
14
   state = {
15
     isManagementStatus: false, //是否是管理状态
15
     isManagementStatus: false, //是否是管理状态
@@ -107,7 +107,7 @@ export default class Index extends Component {
107
                 <Image src={manger} mode="aspectFit" />
107
                 <Image src={manger} mode="aspectFit" />
108
                 <Text className="bottom-buy-text">批量管理</Text>
108
                 <Text className="bottom-buy-text">批量管理</Text>
109
               </View>
109
               </View>
110
-              <View onClick={() => Taro.navigateTo({ url: '/pages/productClassify/index' })} className="bottom-buy-right-share">
110
+              <View onClick={() => Taro.navigateTo({ url: '/pages/memberSub/productClassify/index' })} className="bottom-buy-right-share">
111
                 <Image src={add} mode="aspectFit" />
111
                 <Image src={add} mode="aspectFit" />
112
                 <Text className="bottom-buy-text">添加商品</Text>
112
                 <Text className="bottom-buy-text">添加商品</Text>
113
               </View>
113
               </View>

src/pages/productManagement/index.less → src/pages/memberSub/productManagement/index.less


src/pages/statementRecords/index.config.js → src/pages/memberSub/statementRecords/index.config.js


+ 1 - 1
src/pages/statementRecords/index.jsx

@@ -1,7 +1,7 @@
1
 import { Component } from 'react'
1
 import { Component } from 'react'
2
 import { View, Text, Image } from '@tarojs/components'
2
 import { View, Text, Image } from '@tarojs/components'
3
 import './index.less'
3
 import './index.less'
4
-import statementRecordsIcon from '../../images/statementRecordsIcon.png'
4
+import statementRecordsIcon from '../../../images/statementRecordsIcon.png'
5
 export default class Index extends Component {
5
 export default class Index extends Component {
6
 
6
 
7
 
7
 

src/pages/statementRecords/index.less → src/pages/memberSub/statementRecords/index.less


src/pages/storeManagement/index.config.js → src/pages/memberSub/storeManagement/index.config.js


+ 4 - 4
src/pages/storeManagement/index.jsx

@@ -2,9 +2,9 @@ import { Component } from "react";
2
 import { View, Text, Image } from "@tarojs/components";
2
 import { View, Text, Image } from "@tarojs/components";
3
 import { AtIcon } from "taro-ui";
3
 import { AtIcon } from "taro-ui";
4
 import "./index.less";
4
 import "./index.less";
5
-import storeManagement from "../../images/storeManagement/storeManagement.png";
6
-import storeManagementIcon from "../../images/storeManagement/storeManagementIcon.png";
7
-import ProductCard from "../../components/ProductCard"; //卡片模块
5
+import storeManagement from "../../../images/storeManagement/storeManagement.png";
6
+import storeManagementIcon from "../../../images/storeManagement/storeManagementIcon.png";
7
+import ProductCard from "../../../components/ProductCard"; //卡片模块
8
 import Taro from "@tarojs/taro";
8
 import Taro from "@tarojs/taro";
9
 
9
 
10
 export default class Index extends Component {
10
 export default class Index extends Component {
@@ -102,7 +102,7 @@ export default class Index extends Component {
102
                 <View className="bottom-buy-right-self">
102
                 <View className="bottom-buy-right-self">
103
                   <Text className="bottom-buy-text">店铺模版</Text>
103
                   <Text className="bottom-buy-text">店铺模版</Text>
104
                 </View>
104
                 </View>
105
-                <View onClick={() => Taro.navigateTo({ url:'/pages/productManagement/index' })} className="bottom-buy-right-share">
105
+                <View onClick={() => Taro.navigateTo({ url:'/pages/memberSub/productManagement/index' })} className="bottom-buy-right-share">
106
                   <Text  className="bottom-buy-text">商品管理</Text>
106
                   <Text  className="bottom-buy-text">商品管理</Text>
107
                 </View>
107
                 </View>
108
               </View>
108
               </View>

src/pages/storeManagement/index.less → src/pages/memberSub/storeManagement/index.less


+ 5 - 3
src/pages/mine/index.jsx

@@ -34,14 +34,16 @@ export default class Index extends Component {
34
             <View className="name">张三</View>
34
             <View className="name">张三</View>
35
             <View className="account">138001</View>
35
             <View className="account">138001</View>
36
             </View>
36
             </View>
37
-            <Image className='edit-icon' src={edit}></Image>
37
+            <Image onClick={() => Taro.navigateTo({ url: `/pages/mineSub/infoEdit/index` })} className='edit-icon' src={edit}></Image>
38
           </View>
38
           </View>
39
         </View>
39
         </View>
40
         {/* 功能 */}
40
         {/* 功能 */}
41
         <View className='function'>
41
         <View className='function'>
42
-          <AtList>
43
-            <AtListItem title='用户规范' arrow='right' thumb={norm}/>
42
+          <AtList hasBorder={false}>
43
+            <AtListItem hasBorder={false} onClick={() => Taro.navigateTo({ url: `/pages/mineSub/userSpecification/index` })} title='用户规范' arrow='right' thumb={norm}/>
44
+            <View className='line'></View>
44
             <AtListItem 
45
             <AtListItem 
46
+              hasBorder={false}
45
               title='退出登录' 
47
               title='退出登录' 
46
               arrow='right' 
48
               arrow='right' 
47
               thumb={loginOut}
49
               thumb={loginOut}

+ 5 - 1
src/pages/mine/index.less

@@ -52,7 +52,11 @@
52
         border-radius: 20px;
52
         border-radius: 20px;
53
         overflow: hidden;
53
         overflow: hidden;
54
         background-color: #ffffff;
54
         background-color: #ffffff;
55
-
55
+        .line{
56
+            margin: 0 17px;
57
+            height: 1px;
58
+            background-color: #D8D8D8;
59
+        }
56
         .at-list__item .item-extra__icon-arrow {
60
         .at-list__item .item-extra__icon-arrow {
57
             font-size: 44px;
61
             font-size: 44px;
58
         }
62
         }

src/pages/infoEdit/index.config.js → src/pages/mineSub/infoEdit/index.config.js


src/pages/infoEdit/index.jsx → src/pages/mineSub/infoEdit/index.jsx


src/pages/infoEdit/index.less → src/pages/mineSub/infoEdit/index.less


src/pages/userSpecification/index.config.js → src/pages/mineSub/userSpecification/index.config.js


src/pages/userSpecification/index.jsx → src/pages/mineSub/userSpecification/index.jsx


src/pages/userSpecification/index.less → src/pages/mineSub/userSpecification/index.less


+ 0 - 3
src/pages/productSub/infoEdit/index.config.js

@@ -1,3 +0,0 @@
1
-export default definePageConfig({
2
-  navigationBarTitleText: '编辑个人信息'
3
-})

+ 0 - 25
src/pages/productSub/infoEdit/index.jsx

@@ -1,25 +0,0 @@
1
-import { Component } from 'react'
2
-import { View, Text, Image } from '@tarojs/components'
3
-import './index.less'
4
-import vip from '../../../images/index/back-top.png'
5
-export default class Index extends Component {
6
-
7
-  componentWillMount () { }
8
-
9
-  componentDidMount () { }
10
-
11
-  componentWillUnmount () { }
12
-
13
-  componentDidShow () { }
14
-
15
-  componentDidHide () { }
16
-
17
-  render () {
18
-    return (
19
-      <View className='index'>
20
-        <Image src='https://video-img.fyshark.com/1731495433480WechatIMG674.jpg' className='vip-icon' />
21
-        <Text>编辑个人信息</Text>
22
-      </View>
23
-    )
24
-  }
25
-}

+ 0 - 4
src/pages/productSub/infoEdit/index.less

@@ -1,4 +0,0 @@
1
-Image{
2
-    height: 200px;
3
-    width: 200px;
4
-}