yuantianjiao 6 年之前
父節點
當前提交
fb7da0bc79

+ 7
- 5
src/pages/sales/history/index.vue 查看文件

@@ -9,11 +9,13 @@
9 9
     </div>
10 10
     <div class="list-content" v-if="list.length > 0">
11 11
       <div class="list-year">备注记录</div>
12
-      <div class="list-card" v-for="(item,index) in list" :key="index">
13
-        <div class="point-top"></div>
14
-        <div class="point-bottom"></div>
15
-        <div class="card-time">{{toolClass.dateFormat(item.CreateDate,'MM-dd')}}</div>
16
-        <div class="card-content">{{item.Remark}}</div>
12
+      <div style="background:#fff">
13
+        <div class="list-card" v-for="(item,index) in list" :key="index">
14
+          <div class="point-top"></div>
15
+          <div class="point-bottom"></div>
16
+          <div class="card-time">{{toolClass.dateFormat(item.CreateDate,'MM-dd')}}</div>
17
+          <div class="card-content">{{item.Remark}}</div>
18
+        </div>
17 19
       </div>
18 20
     </div>
19 21
     <noMore v-if="list.length <= 0"></noMore>

+ 2
- 0
src/pages/sales/history/page.scss 查看文件

@@ -11,6 +11,7 @@
11 11
     }
12 12
   }
13 13
   .list-content{
14
+    background: #fff;
14 15
     .list-year{
15 16
       width: 1.1rem;
16 17
       height: .24rem;
@@ -27,6 +28,7 @@
27 28
       padding: 0 0 .3rem .2rem;
28 29
       border-left: 1px solid #C9C9C9;
29 30
       position: relative;
31
+      background-color: #fff;
30 32
       .point-top{
31 33
         position: absolute;
32 34
         top: -.04rem;

+ 8
- 4
src/pages/user/rush/index.vue 查看文件

@@ -72,10 +72,8 @@ export default {
72 72
   created () {
73 73
     this.AddNewFlashBuyCustomer({ flashBuyId: this.$route.query.flashBuyId }).then(() => {
74 74
       this.getRush({ flashBuyId: this.$route.query.flashBuyId }).then((res) => {
75
-        if (res.userInfo) {
76
-          this.used = true
77
-          this.newCustomer = res
78
-        }
75
+        this.used = res.IsAttend
76
+        this.newCustomer = res.IsNew ? true : false
79 77
         let start = new Date(this.detail.StartDate).getTime()
80 78
         let end = new Date(this.detail.EndDate).getTime()
81 79
         this.timing(start, end)
@@ -143,3 +141,9 @@ export default {
143 141
 <style lang="scss" scoped>
144 142
 @import 'page.scss';
145 143
 </style>
144
+
145
+<style>
146
+.rule img {
147
+  width: 100%;
148
+}
149
+</style>

+ 7
- 0
src/pages/user/rush/page.scss 查看文件

@@ -37,6 +37,13 @@
37 37
     text-align: left;
38 38
     line-height: .18rem;
39 39
     color: #585858;
40
+    box-sizing: border-box;
41
+    p{
42
+      width: 100%;
43
+      img{
44
+        width: 100%;
45
+      }
46
+    }
40 47
   }
41 48
   .scope-of-time{
42 49
     div:nth-of-type(1){