许成详 6 gadus atpakaļ
vecāks
revīzija
13070c59c8

+ 63
- 0
src/components/orderListItem/index.vue Parādīt failu

@@ -0,0 +1,63 @@
1
+<template>
2
+  <div class="orderListItem">
3
+    <div class="title flex-h">
4
+      <div class="orange">
5
+        <i class="iconfont icon-dengdai"></i><br>
6
+        <span>制作中</span>
7
+      </div>
8
+      <div class="flex-item">
9
+        <div>
10
+          <span>悦见山</span>
11
+        </div>
12
+      </div>
13
+      <span>02/16 14:20</span>
14
+    </div>
15
+    <div class="line">
16
+      <div>
17
+        <i v-for="(iconItem,iconIndex) in 40" :key="iconIndex"></i>
18
+      </div>
19
+    </div>
20
+    <div class="list flex-h">
21
+      <div class="flex-item">
22
+        <ul>
23
+          <li>
24
+            <span>商品名称</span>
25
+            <div>
26
+              <span>¥20 x 2</span>
27
+            </div>
28
+          </li>
29
+        </ul>
30
+      </div>
31
+    </div>
32
+  </div>
33
+</template>
34
+
35
+<script>
36
+
37
+export default {
38
+  name: '',
39
+  props: ['data'],
40
+  data () {
41
+    return {
42
+
43
+    }
44
+  },
45
+  computed: {
46
+
47
+  },
48
+  components: {
49
+
50
+  },
51
+  created () {
52
+
53
+  },
54
+  methods: {
55
+    
56
+  }
57
+}
58
+</script>
59
+
60
+<!-- Add "scoped" attribute to limit CSS to this component only -->
61
+<style lang="scss" scoped>
62
+@import "page.scss";
63
+</style>

+ 120
- 0
src/components/orderListItem/page.scss Parādīt failu

@@ -0,0 +1,120 @@
1
+.orderListItem{
2
+  width: 100%;
3
+  position: relative;
4
+  overflow: hidden;
5
+  .title{
6
+    width: 100%;
7
+    position: relative;
8
+    overflow: hidden;
9
+    align-items: center;
10
+    &>div:nth-child(1){
11
+      width: .5rem;
12
+      text-align: center;
13
+      *{
14
+        display: inline-block;
15
+        font-size: .1rem;
16
+        line-height: .17rem;
17
+      }
18
+      i{
19
+        font-size: .15rem;
20
+      }
21
+    }
22
+    &>div:nth-child(1).orange{
23
+      *{
24
+        color: #fc6243;
25
+      }
26
+    }
27
+    &>div:nth-child(1).grey{
28
+      *{
29
+        color: #ccc;
30
+      }
31
+    }
32
+    &>div:nth-child(1).green{
33
+      *{
34
+        color: #63c86f;
35
+      }
36
+    }
37
+    &>div:nth-child(2){
38
+      margin-right: .1rem;
39
+      &>div{
40
+        width: 100%;
41
+        position: relative;
42
+        overflow: hidden;
43
+        span{
44
+          width: 100%;
45
+          display: block;
46
+          font-size: .14rem;
47
+          overflow: hidden;
48
+          text-overflow: ellipsis;
49
+          white-space: nowrap;
50
+        }
51
+      }
52
+    }
53
+    &>span{
54
+      font-size: .11rem;
55
+      color: #666;
56
+      margin-right: .15rem;
57
+    }
58
+  }
59
+  .line{
60
+    width: 100%;
61
+    height: .2rem;
62
+    position: relative;
63
+    overflow: hidden;
64
+    &>div{
65
+      width: 100%;
66
+      position: absolute;
67
+      overflow: hidden;
68
+      left: 0;
69
+      top: 50%;
70
+      transform: translateY(-50%) translateX(-.035rem);
71
+      -webkit-transform: translateY(-50%) translateX(-.035rem);
72
+      font-size: 0;
73
+      white-space: nowrap;
74
+      i{
75
+        display: inline-block;
76
+        width: .07rem;
77
+        height: .07rem;
78
+        position: relative;
79
+        overflow: hidden;
80
+        border-radius: 100%;
81
+        background: #eee;
82
+        margin-right: .1rem;
83
+      }
84
+    }
85
+  }
86
+  .list{
87
+    &>div{
88
+      margin: 0 .15rem;
89
+      &>ul{
90
+        margin: .06rem auto;
91
+        &>li{
92
+          font-size: 0;
93
+          white-space: nowrap;
94
+          &>*{
95
+            display: inline-block;
96
+            vertical-align: middle;
97
+            width: 50%;
98
+            overflow: hidden;
99
+            text-overflow: ellipsis;
100
+            white-space: nowrap;
101
+          }
102
+          &>span{
103
+            line-height: .26rem;
104
+            font-size: .14rem;
105
+            color: #555;
106
+          }
107
+          &>div{
108
+            text-align: right;
109
+            font-size: 0;
110
+            span{
111
+              font-size: .11rem;
112
+              line-height: .26rem;
113
+              color: #666;
114
+            }
115
+          }
116
+        }
117
+      }
118
+    }
119
+  }
120
+}

+ 42
- 0
src/components/topCaseInfo/index.vue Parādīt failu

@@ -0,0 +1,42 @@
1
+<template>
2
+  <div class="topCaseInfo flex-h">
3
+    <i class="iconfont icon-dingwei"></i>
4
+      <span>{{data.caseName}}</span>
5
+      <a v-if="data.showSelect" @click="selectCase">请选择</a>
6
+      <div class="flex-item">
7
+        <span>{{data.userName}}您好!</span>
8
+      </div>
9
+  </div>
10
+</template>
11
+
12
+<script>
13
+
14
+export default {
15
+  name: '',
16
+  props: ['data'],
17
+  data () {
18
+    return {
19
+
20
+    }
21
+  },
22
+  computed: {
23
+
24
+  },
25
+  components: {
26
+
27
+  },
28
+  created () {
29
+
30
+  },
31
+  methods: {
32
+    selectCase () { // 选择案场
33
+      this.$emit('selectCase')
34
+    },
35
+  }
36
+}
37
+</script>
38
+
39
+<!-- Add "scoped" attribute to limit CSS to this component only -->
40
+<style lang="scss" scoped>
41
+@import "page.scss";
42
+</style>

+ 31
- 0
src/components/topCaseInfo/page.scss Parādīt failu

@@ -0,0 +1,31 @@
1
+.topCaseInfo{
2
+  align-items: center;
3
+  background: rgba(0, 0, 0, .3);
4
+  padding: .05rem 0;
5
+  &>*{
6
+    margin-left: .05rem;
7
+    line-height: .2rem;
8
+    font-size: .12rem;
9
+    color: #fff;
10
+  }
11
+  i{
12
+    font-size: .15rem;
13
+  }
14
+  a{
15
+    color: #fb6b2f;
16
+    text-decoration: underline;
17
+    margin-left: .1rem;
18
+  }
19
+  &>*:first-child{
20
+    margin-left: .2rem;
21
+  }
22
+  &>div{
23
+    text-align: right;
24
+    margin-right: .2rem;
25
+    font-size: 0;
26
+    span{
27
+      font-size: .12rem;
28
+      color: #fff;
29
+    }
30
+  }
31
+}

+ 10
- 8
src/module/user/mainPage/coffeeIndex/index.vue Parādīt failu

@@ -1,12 +1,7 @@
1 1
 <template>
2 2
   <div class="mainPage flex-v">
3
-    <div class="top flex-h">
4
-      <i class="iconfont icon-dingwei"></i>
5
-      <span>{{caseInfo.value}}</span>
6
-      <a @click="showSelect = true">请选择</a>
7
-      <div class="flex-item">
8
-        <span>Alise您好!</span>
9
-      </div>
3
+    <div class="top">
4
+      <topCaseInfo :data="topCaseInfoData" @selectCase="selectCase"></topCaseInfo>
10 5
     </div>
11 6
     <div class="content flex-item">
12 7
       <div>
@@ -57,11 +52,18 @@
57 52
 </template>
58 53
 
59 54
 <script>
55
+import topCaseInfo from '../../../../components/topCaseInfo/index'
60 56
 
61 57
 export default {
62 58
   name: '',
63 59
   data () {
64 60
     return {
61
+      topCaseInfoData: {
62
+        caseName: 'xxx',
63
+        caseId: '',
64
+        showSelect: true,
65
+        userName: 'xxx'
66
+      },
65 67
       caseInfo: {
66 68
         value: '案场一',
67 69
         id: ''
@@ -93,7 +95,7 @@ export default {
93 95
 
94 96
   },
95 97
   components: {
96
-
98
+    topCaseInfo,
97 99
   },
98 100
   created () {
99 101
 

+ 31
- 29
src/module/user/mainPage/coffeeIndex/page.scss Parādīt failu

@@ -1,34 +1,36 @@
1 1
 .mainPage{
2 2
   .top{
3
-    align-items: center;
4
-    background: rgba(0, 0, 0, .3);
5
-    padding: .05rem 0;
6
-    &>*{
7
-      margin-left: .05rem;
8
-      line-height: .2rem;
9
-      font-size: .12rem;
10
-      color: #fff;
11
-    }
12
-    i{
13
-      font-size: .15rem;
14
-    }
15
-    a{
16
-      color: #fb6b2f;
17
-      text-decoration: underline;
18
-      margin-left: .1rem;
19
-    }
20
-    &>*:first-child{
21
-      margin-left: .2rem;
22
-    }
23
-    &>div{
24
-      text-align: right;
25
-      margin-right: .2rem;
26
-      font-size: 0;
27
-      span{
28
-        font-size: .12rem;
29
-        color: #fff;
30
-      }
31
-    }
3
+    position: relative;
4
+    overflow: hidden;
5
+    // align-items: center;
6
+    // background: rgba(0, 0, 0, .3);
7
+    // padding: .05rem 0;
8
+    // &>*{
9
+    //   margin-left: .05rem;
10
+    //   line-height: .2rem;
11
+    //   font-size: .12rem;
12
+    //   color: #fff;
13
+    // }
14
+    // i{
15
+    //   font-size: .15rem;
16
+    // }
17
+    // a{
18
+    //   color: #fb6b2f;
19
+    //   text-decoration: underline;
20
+    //   margin-left: .1rem;
21
+    // }
22
+    // &>*:first-child{
23
+    //   margin-left: .2rem;
24
+    // }
25
+    // &>div{
26
+    //   text-align: right;
27
+    //   margin-right: .2rem;
28
+    //   font-size: 0;
29
+    //   span{
30
+    //     font-size: .12rem;
31
+    //     color: #fff;
32
+    //   }
33
+    // }
32 34
   }
33 35
   .content{
34 36
     &>div{

+ 26
- 3
src/module/user/orderList/index.vue Parādīt failu

@@ -1,20 +1,43 @@
1 1
 <template>
2 2
   <div class="mainPage flex-v">
3
-    1
3
+    <div class="top">
4
+      <topCaseInfo :data="topCaseInfoData"></topCaseInfo>
5
+    </div>
6
+    <div class="flex-item">
7
+      <div class="flex-h">
8
+        <div class="flex-item">
9
+          <ul>
10
+            <li v-for="(item,index) in 10" :key="index">
11
+              <orderListItem></orderListItem>
12
+            </li>
13
+          </ul>
14
+        </div>
15
+      </div>
16
+    </div>
4 17
   </div>
5 18
 </template>
6 19
 
7 20
 <script>
21
+import topCaseInfo from '../../../components/topCaseInfo/index'
22
+import orderListItem from '../../../components/orderListItem/index'
8 23
 
9 24
 export default {
10 25
   name: '',
11 26
   data () {
12 27
     return {
13
-      
28
+      topCaseInfoData: {
29
+        caseName: 'xxx',
30
+        caseId: '',
31
+        showSelect: false,
32
+        userName: 'xxx'
33
+      },
14 34
     }
15 35
   },
16 36
   computed: {},
17
-  components: {},
37
+  components: {
38
+    topCaseInfo,
39
+    orderListItem,
40
+  },
18 41
   created () { },
19 42
   methods: {
20 43
     

+ 148
- 1
src/module/user/orderList/page.scss Parādīt failu

@@ -1,3 +1,150 @@
1 1
 .mainPage{
2
-  
2
+  &>div.flex-item{
3
+    &>div{
4
+      width: 100%;
5
+      position: absolute;
6
+      left: 0;
7
+      top: 0;
8
+      bottom: 0;
9
+      overflow-y: scroll;
10
+      -webkit-overflow-scrolling: touch;
11
+      transform: translateZ(0);
12
+      -webkit-transform: translateZ(0);
13
+      &>div{
14
+        margin: 0 .25rem;
15
+        overflow: visible;
16
+        &>ul{
17
+          width: 100%;
18
+          position: relative;
19
+          overflow: visible;
20
+          margin-bottom: .25rem;
21
+          &>li{
22
+            width: 100%;
23
+            position: relative;
24
+            overflow: hidden;
25
+            border-radius: .1rem;
26
+            background: #fff;
27
+            box-shadow: 0 0 .2rem .02rem rgba(0, 0, 0, .1);
28
+            padding: .08rem 0;
29
+            margin: .25rem auto 0;
30
+            // .title{
31
+            //   width: 100%;
32
+            //   position: relative;
33
+            //   overflow: hidden;
34
+            //   align-items: center;
35
+            //   &>div:nth-child(1){
36
+            //     width: .5rem;
37
+            //     text-align: center;
38
+            //     *{
39
+            //       display: inline-block;
40
+            //       font-size: .1rem;
41
+            //       line-height: .17rem;
42
+            //     }
43
+            //     i{
44
+            //       font-size: .15rem;
45
+            //     }
46
+            //   }
47
+            //   &>div:nth-child(1).orange{
48
+            //     *{
49
+            //       color: #fc6243;
50
+            //     }
51
+            //   }
52
+            //   &>div:nth-child(1).grey{
53
+            //     *{
54
+            //       color: #ccc;
55
+            //     }
56
+            //   }
57
+            //   &>div:nth-child(1).green{
58
+            //     *{
59
+            //       color: #63c86f;
60
+            //     }
61
+            //   }
62
+            //   &>div:nth-child(2){
63
+            //     margin-right: .1rem;
64
+            //     &>div{
65
+            //       width: 100%;
66
+            //       position: relative;
67
+            //       overflow: hidden;
68
+            //       span{
69
+            //         width: 100%;
70
+            //         display: block;
71
+            //         font-size: .14rem;
72
+            //         overflow: hidden;
73
+            //         text-overflow: ellipsis;
74
+            //         white-space: nowrap;
75
+            //       }
76
+            //     }
77
+            //   }
78
+            //   &>span{
79
+            //     font-size: .11rem;
80
+            //     color: #666;
81
+            //     margin-right: .15rem;
82
+            //   }
83
+            // }
84
+            // .line{
85
+            //   width: 100%;
86
+            //   height: .2rem;
87
+            //   position: relative;
88
+            //   overflow: hidden;
89
+            //   &>div{
90
+            //     width: 100%;
91
+            //     position: absolute;
92
+            //     overflow: hidden;
93
+            //     left: 0;
94
+            //     top: 50%;
95
+            //     transform: translateY(-50%) translateX(-.035rem);
96
+            //     -webkit-transform: translateY(-50%) translateX(-.035rem);
97
+            //     font-size: 0;
98
+            //     white-space: nowrap;
99
+            //     i{
100
+            //       display: inline-block;
101
+            //       width: .07rem;
102
+            //       height: .07rem;
103
+            //       position: relative;
104
+            //       overflow: hidden;
105
+            //       border-radius: 100%;
106
+            //       background: #eee;
107
+            //       margin-right: .1rem;
108
+            //     }
109
+            //   }
110
+            // }
111
+            // .list{
112
+            //   &>div{
113
+            //     margin: 0 .15rem;
114
+            //     &>ul{
115
+            //       margin: .06rem auto;
116
+            //       &>li{
117
+            //         font-size: 0;
118
+            //         white-space: nowrap;
119
+            //         &>*{
120
+            //           display: inline-block;
121
+            //           vertical-align: middle;
122
+            //           width: 50%;
123
+            //           overflow: hidden;
124
+            //           text-overflow: ellipsis;
125
+            //           white-space: nowrap;
126
+            //         }
127
+            //         &>span{
128
+            //           line-height: .26rem;
129
+            //           font-size: .14rem;
130
+            //           color: #555;
131
+            //         }
132
+            //         &>div{
133
+            //           text-align: right;
134
+            //           font-size: 0;
135
+            //           span{
136
+            //             font-size: .11rem;
137
+            //             line-height: .26rem;
138
+            //             color: #666;
139
+            //           }
140
+            //         }
141
+            //       }
142
+            //     }
143
+            //   }
144
+            // }
145
+          }
146
+        }
147
+      }
148
+    }
149
+  }
3 150
 }