Adam / gulu-vue

Blame view

src/pages/cart/cart.vue 15.7 KB
edit raw normal view history
0db291810   BigBoss   “-mcomfirmOder页面 
1
 
  <template>
a3d2beaa8   范牧   立即支付功能 
2
3
 
    <view class="content">
      <block v-if="cartList.length==0">
7a7226fea   范牧   冲突合并 
4
a3d2beaa8   范牧   立即支付功能 
5
6
7
8
9
10
 
      </block>
      <block v-else>
        <view class="card">
          <view class="cardHeader">
            <view
              v-bind:class="pIsoPen? 'partentChecked' : 'partentCheck'"
a3d2beaa8   范牧   立即支付功能 
11
12
13
14
15
16
17
18
19
 
            >
              <span class="correct"></span>
            </view>
            <image
              src="../../static/store.png"
              mode="aspectFill"
            ></image>
            <text>非常戴镜</text>
          </view>
a3d2beaa8   范牧   立即支付功能 
20
21
22
 
          <view
            class="cardBody"
            v-for="(item,index) in cartList"
93e6a2650   喻鹏   首页懒加载 
23
 
            :key="index"
a3d2beaa8   范牧   立即支付功能 
24
25
26
27
 
            @longpress="delCart(item.cart_id,index)"
          >
            <view
              v-bind:class="childIsOpen[index]? 'partentChecked':'partentCheck'"
a3d2beaa8   范牧   立即支付功能 
28
29
30
31
32
33
34
35
36
37
38
 
            >
              <span class="correct"></span>
            </view>
            <view class="imageWrap">
              <image
                :src="item.img_index_url"
                mode="aspectFit"
                style="width: 188rpx;height: 168rpx;"
              ></image>
            </view>
            <view class="goodInfo">
55420a8a9   范牧   解决冲突 
39
40
41
 
              <!-- <view class="imageWrap">
                <image :src="item.img_index_url" mode="aspectFit" style="width: 188rpx;height: 168rpx;"></image>
              </view> -->
a3d2beaa8   范牧   立即支付功能 
42
43
44
45
46
 
              <view class="infoRight">
                <view
                  class="goodName"
                  @tap="toGoods(item.pid,item.sk_id)"
                >{{item.p_name}}</view>
22e1420fa   BigBoss   弹窗组件修改 
47
48
49
50
51
52
53
54
55
56
57
58
 
                <view class="describ"  @click="showBottom(3,item.pid,item.sk_id,item.mp_id,item.cart_id,index)">
  				  <view class="desL">
  						<view class="people">
  							使用人：{{item.peopleName}}
  						</view>
  						<view class="skuInfo">
  							{{item.sku_name}}
  						</view>
  				  </view>
  				  <view class="desR">
  						<image src="../../static/right.png" mode="aspectFit" style="width: 18rpx;height: 18rpx;"></image>
  				  </view>
0bda9efec   BigBoss   购物车功能修改 
59
 
                </view>
a3d2beaa8   范牧   立即支付功能 
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
 
                <view class="priceBox">
                  <view class="price">￥{{item.nowPrice*item.num}}</view>
                  <text class="maxCount">(限购{{maxCount}}副)</text>
                  <view class="counter">
                    <view
                      class="btn"
                      disabled="this.addDisabled"
                      type="default"
                      @tap="counter(index,false,item)"
                    >-</view>
                    <text>{{item.num}}</text>
                    <view
                      class="btn"
                      disabled="this.desDisabled"
                      type="default"
                      @tap="counter(index,true,item)"
                    >+</view>
                  </view>
                </view>
              </view>
            </view>
          </view>
        </view>
      </block>
      <view class="footer">
        <view class="footerLeft">实付金额:<text>￥{{totalPrice}}</text></view>
        <view class="footerRight">
0bda9efec   BigBoss   购物车功能修改 
87
 
            <view class="paybtn" @click="toComfirmOrder">立即结算</view>
a3d2beaa8   范牧   立即支付功能 
88
89
 
        </view>
      </view>
22e1420fa   BigBoss   弹窗组件修改 
90
91
92
 
  	<BottomSheet v-if="isShowBottom" :isCart="isCart" @addCart="addCart" :sk_id="sk_id" :propMpId="mp_id" @chooseCartModi="chooseCartModi" :cart_id="cart_id"
  	:index="cartIndex"
  	 :pid="pid" :goodInfo="goodInfo" :isShowBottom="isShowBottom"  @closeBottom="closeBottom"></BottomSheet>
a3d2beaa8   范牧   立即支付功能 
93
 
    </view>
0db291810   BigBoss   “-mcomfirmOder页面 
94
95
96
 
  </template>
  
  <script>
0bda9efec   BigBoss   购物车功能修改 
97
7a7226fea   范牧   冲突合并 
98
 
  import store from '@/store'
22e1420fa   BigBoss   弹窗组件修改 
99
100
101
102
103
 
  import BottomSheet from '../../components/BottomSheet/BottomSheet.vue';
  export default {  
  	components:{
  		BottomSheet,
  	},
7a7226fea   范牧   冲突合并 
104
105
 
    data() {
      return {
22e1420fa   BigBoss   弹窗组件修改 
106
107
108
109
110
111
112
113
114
115
116
 
  		pid:Number,
  		isCart:Number,
  		sk_id:String,
  		mp_id:String,
  		isShowBottom : false,	//底部弹窗开关
  		totalPrice: 0,
  		pIsoPen: false,
  		// childIsOpen:[],
  		cart_id:Number,
  		maxCount: 20,
  		cartIndex:Number
7a7226fea   范牧   冲突合并 
117
118
119
 
      }
    },
    computed: {
0bda9efec   BigBoss   购物车功能修改 
120
121
122
 
  	// skInfo(){
  	// 	return filters()
  	// }
22e1420fa   BigBoss   弹窗组件修改 
123
124
125
126
 
  	goodInfo () {
  	  // console.log(this.$store.state.read.goodInfo)
  	  return this.$store.state.read.goodInfo
  	},
7a7226fea   范牧   冲突合并 
127
 
      cartList() {
b9fb65756   喻鹏   购物车和推荐产品根据sk_id来对应价格 
128
 
        // console.log('cart-list', this.$store.state.cart.cartList);
0bda9efec   BigBoss   购物车功能修改 
129
 
  	  // this.totalPrice=0
637a02b07   尹聃   添加购物车 
130
 
        return this.$store.state.cart.cartList
7a7226fea   范牧   冲突合并 
131
132
133
134
135
136
137
 
      },
      childIsOpen() {
        const temp = []
        temp.length = this.$store.state.cart.cartList.length
        for (let i = 0; i < temp.length; i++) {
          temp[i] = false
        }
22e1420fa   BigBoss   弹窗组件修改 
138
 
        // console.log('this.childisOPne===>', temp)
7a7226fea   范牧   冲突合并 
139
 
        return temp
a3d2beaa8   范牧   立即支付功能 
140
 
      },
7a7226fea   范牧   冲突合并 
141
 
    },
22e1420fa   BigBoss   弹窗组件修改 
142
143
144
 
    onShow() {
    	this.pIsoPen = false
    },
7a7226fea   范牧   冲突合并 
145
 
    onLoad: function() {
7a7226fea   范牧   冲突合并 
146
 
      store.dispatch('cart/getCartList', {
a3d2beaa8   范牧   立即支付功能 
147
 
        uid: this.$store.state.user.userInfo.uid, // 用户id
7a7226fea   范牧   冲突合并 
148
149
 
      })
    },
7a7226fea   范牧   冲突合并 
150
 
    methods: {
22e1420fa   BigBoss   弹窗组件修改 
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
 
  	  //修改购物车
  	  chooseCartModi(mp_id,sk_id,price,pid,num,cart_id,index){
  		  // console.log('modi',mp_id,sk_id,price,pid,num,cart_id)
  		  store.dispatch('cart/modiCart', {
  		    uid: this.$store.state.user.userInfo.uid,
  		    openid: this.$store.state.user.userInfo.openid,
  		    mp_id: mp_id,
  		    sk_id: sk_id,
  		    price: price,
  		    pid: pid,
  		    num: num,
  		    cart_id: cart_id,
  			args: {
  			  index: index,
  			},
  		  })
  		  store.dispatch('cart/getCartList', {
  			uid: this.$store.state.user.userInfo.uid, // 用户id
  		  })
  	  
  		  this.$forceUpdate()
  		  console.log('21212121212',this.cartList)
  	  },
  	  //底部弹窗开关
  	  showBottom(isCart,pid,skId,mp_id,cart_id,index){
  		  store.dispatch('read/fetch', {
  			pid,
  			sk_id: skId,
  		  }).then(()=>{
  			  this.cartIndex = index
  			  this.sk_id = skId;
  			  this.pid = pid;
  			  this.mp_id = mp_id;
  			  this.isCart = isCart;
  			  this.cart_id = cart_id;
  			  this.isShowBottom = true;
  		  })
  	  },
  	  closeBottom(){
  	  	this.isShowBottom = false;
  	  },
b9fb65756   喻鹏   购物车和推荐产品根据sk_id来对应价格 
192
 
      toGoods(id, sk_id) {
55420a8a9   范牧   解决冲突 
193
194
195
196
197
198
199
200
 
        console.log('cart-list', this.$store.state.cart.cartList)
        console.log('---', '../frameDetail/frameDetail?pid=' + id + '&sk_id=' + sk_id)
        uni.navigateTo({
          url: '../frameDetail/frameDetail?pid=' + id + '&sk_id=' + sk_id,
          success: res => {},
          fail: () => {},
          complete: () => {},
        })
7a7226fea   范牧   冲突合并 
201
 
      },
0bda9efec   BigBoss   购物车功能修改 
202
203
204
 
  	toComfirmOrder(){
  		uni.navigateTo({
  			url:`../confirmOrder/confirmOrder`,
0bda9efec   BigBoss   购物车功能修改 
205
206
 
  		})
  	},
b83c44fe1   喻鹏   购物车和用户推荐传参 
207
 
      counter(index, isadd, item) {
7a7226fea   范牧   冲突合并 
208
209
 
        // console.log('===>>counter ===>num',num)
        // console.log('===>>counter ===>isadd',isadd)
55420a8a9   范牧   解决冲突 
210
211
 
        console.log('item=====>', item)
        console.log('num=====>', item.num)
a3d2beaa8   范牧   立即支付功能 
212
 
        const nums = parseInt(item.num)
7a7226fea   范牧   冲突合并 
213
 
        if (isadd) {
b83c44fe1   喻鹏   购物车和用户推荐传参 
214
 
          if (nums >= this.maxCount) {
7a7226fea   范牧   冲突合并 
215
216
217
218
 
            this.addDisabled = true
          } else {
            this.addDisabled = true
            // 修改num
22e1420fa   BigBoss   弹窗组件修改 
219
220
221
 
            // if (this.childIsOpen[index]) {
            //   this.totalPrice = this.totalPrice + this.$store.state.cart.cartList[index].nowPrice
            // }
7a7226fea   范牧   冲突合并 
222
 
            store.dispatch('cart/modiCart', {
acc7ee230   喻鹏   购物车，用户推荐，新增验光逻辑修改 
223
224
 
              uid: this.$store.state.user.userInfo.uid,
              openid: this.$store.state.user.userInfo.openid,
b83c44fe1   喻鹏   购物车和用户推荐传参 
225
226
 
              mp_id: item.mp_id,
              sk_id: item.sk_id,
a3d2beaa8   范牧   立即支付功能 
227
228
 
              price: item.nowPrice,
              pid: item.pid,
b83c44fe1   喻鹏   购物车和用户推荐传参 
229
 
              num: nums + 1,
a3d2beaa8   范牧   立即支付功能 
230
 
              cart_id: item.cart_id,
7a7226fea   范牧   冲突合并 
231
232
 
              args: {
                index: index,
a3d2beaa8   范牧   立即支付功能 
233
234
 
                isadd: isadd,
              },
7a7226fea   范牧   冲突合并 
235
236
237
238
 
            })
            this.addDisabled = false
          }
        } else {
b83c44fe1   喻鹏   购物车和用户推荐传参 
239
 
          if (nums <= 1) {
7a7226fea   范牧   冲突合并 
240
241
242
243
 
            this.desDisabled = true
          } else {
            this.desDisabled = false
            // post 请求修改相关参数
22e1420fa   BigBoss   弹窗组件修改 
244
245
246
 
            // if (this.childIsOpen[index]) {
            //   this.totalPrice = this.totalPrice - this.$store.state.cart.cartList[index].nowPrice
            // }
7a7226fea   范牧   冲突合并 
247
 
            store.dispatch('cart/modiCart', {
acc7ee230   喻鹏   购物车，用户推荐，新增验光逻辑修改 
248
249
 
              uid: this.$store.state.user.userInfo.uid,
              openid: this.$store.state.user.userInfo.openid,
b83c44fe1   喻鹏   购物车和用户推荐传参 
250
251
 
              mp_id: item.mp_id,
              sk_id: item.sk_id,
a3d2beaa8   范牧   立即支付功能 
252
253
 
              price: item.nowPrice,
              pid: item.pid,
b83c44fe1   喻鹏   购物车和用户推荐传参 
254
 
              num: nums - 1,
a3d2beaa8   范牧   立即支付功能 
255
 
              cart_id: item.cart_id,
7a7226fea   范牧   冲突合并 
256
257
 
              args: {
                index: index,
a3d2beaa8   范牧   立即支付功能 
258
259
 
                isadd: isadd,
              },
7a7226fea   范牧   冲突合并 
260
261
262
263
 
            })
            this.desDisabled = true
          }
        }
22e1420fa   BigBoss   弹窗组件修改 
264
7a7226fea   范牧   冲突合并 
265
 
      },
22e1420fa   BigBoss   弹窗组件修改 
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
 
      // Change(isopen, indexC) {
      //   // console.log('lalla===>',isopen)
      //   this.childIsOpen[indexC] = !isopen
      //   if (!isopen) {
      //     this.totalPrice = this.totalPrice + (this.$store.state.cart.cartList[indexC].num * this.$store.state.cart.cartList[indexC].nowPrice)
      //   } else {
      //     this.totalPrice = this.totalPrice - (this.$store.state.cart.cartList[indexC].num * this.$store.state.cart.cartList[indexC].nowPrice)
      //   }
      //   let m = true
      //   for (let i = 0; i < this.childIsOpen.length; i++) {
      //     m = m & this.childIsOpen[i]
      //   }
      //   if (m === 1) {
      //     this.pIsoPen = true
      //   } else {
      //     this.pIsoPen = false
      //   }
      // },
      // pChange(isopen) {
      //   this.pIsoPen = !isopen
      //   for (let i = 0; i < this.childIsOpen.length; i++) {
      //     this.childIsOpen[i] = !isopen
      //   }
      //   if (this.pIsoPen) {
      //     // 计算总价逻辑
      //     if (this.childIsOpen.length !== 0) {
      //       for (let i = 0; i < this.childIsOpen.length; i++) {
      //         if (this.childIsOpen[i]) {
      //           this.totalPrice = this.totalPrice + (this.$store.state.cart.cartList[i].num * this.$store.state.cart.cartList[i].nowPrice)
      //         }
      //       }
      //     }
      //   } else {
      //     this.totalPrice = 0
      //   }
      // },
7a7226fea   范牧   冲突合并 
302
303
304
305
306
307
 
      delCart(cart_id, index) {
        // console.log('userInfo',this.$store.state.user.userInfo)
        cart_id = parseInt(cart_id)
        // console.log('delcart------>cart_id',cart_id)
        // console.log('cartlist====>delcart',this.$store.state.cart.cartList)
        // console.log('delcart======>index',index)
93e6a2650   喻鹏   首页懒加载 
308
309
310
311
312
 
  	  uni.showModal({
  	    title: '是否删除该商品',
  	    // content: '是否删除该商品',
  	    success: function (res) {
  	      if (res.confirm) {
22e1420fa   BigBoss   弹窗组件修改 
313
314
315
 
  			// if (this.childIsOpen[index]) {
  			//   this.totalPrice = this.totalPrice - (this.$store.state.cart.cartList[index].nowPrice*this.$store.state.cart.cartList[index].num)
  			// }
93e6a2650   喻鹏   首页懒加载 
316
317
318
319
320
321
322
323
324
325
 
  			console.log('index===>',index)
  	        store.dispatch('cart/delCart', {
  	          uid: this.$store.state.user.userInfo.uid,
  	          openid: this.$store.state.user.userInfo.openid,
  	          cart_id: cart_id, // 要修改的购物车id
  	          arg: index, // 由于action 传参是能接收两参数，因此将index放入对象
  	        })
  	      }
  	    }.bind(this),
  	  })
a3d2beaa8   范牧   立即支付功能 
326
327
 
      },
    },
7a7226fea   范牧   冲突合并 
328
 
  }
0db291810   BigBoss   “-mcomfirmOder页面 
329
330
 
  </script>
6111092e8   BigBoss   update cart 
331
 
  <style lang="scss">
637a02b07   尹聃   添加购物车 
332
 
  .content {
a3d2beaa8   范牧   立即支付功能 
333
334
335
336
337
338
339
340
 
    min-height: 100vh;
    background-color: #f2f2f2;
    display: flex;
    flex-direction: column;
    align-items: center;
    justify-content: space-between;
    padding: 20rpx 40rpx;
    box-sizing: border-box;
66638e4bb   喻鹏   购物车样式和新增验光单样式修改 
341
a3d2beaa8   范牧   立即支付功能 
342
343
344
345
346
347
 
    .partentCheck {
      width: 16px;
      height: 16px;
      border-radius: 22px;
      border: 1px solid #cfcfcf;
      background-color: #ffffff;
93e6a2650   喻鹏   首页懒加载 
348
 
      margin: 24rpx 12rpx 24rpx 24rpx;
a3d2beaa8   范牧   立即支付功能 
349
350
351
352
353
354
 
    }
    .partentChecked {
      width: 18px;
      height: 18px;
      border-radius: 22px;
      background-color: #ff6b4a;
93e6a2650   喻鹏   首页懒加载 
355
 
      margin: 24rpx 12rpx 24rpx 24rpx;
a3d2beaa8   范牧   立即支付功能 
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
 
      .correct {
        display: inline-block;
        position: relative;
        width: 10rpx;
        height: 2rpx;
        background: #ffffff;
        line-height: 0;
        font-size: 0;
        position: relative;
        top: -7px;
        left: 4px;
        -webkit-transform: rotate(45deg);
      }
      .correct:after {
        content: "/";
        display: block;
        width: 16rpx;
        height: 2rpx;
        background: #ffffff;
        -webkit-transform: rotate(-90deg) translateY(50%) translateX(50%);
      }
    }
66638e4bb   喻鹏   购物车样式和新增验光单样式修改 
378
a3d2beaa8   范牧   立即支付功能 
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
 
    .card {
      background-color: #ffffff;
      border-radius: 16rpx;
      box-sizing: border-box;
      padding: 36rpx 36rpx 36rpx 18rpx;
      display: flex;
      flex-direction: column;
      align-items: center;
      justify-content: space-between;
      margin-bottom: 180rpx;
      .cardHeader {
        width: 100%;
        height: 36rpx;
        display: flex;
        align-items: center;
        justify-content: flex-start;
        margin-bottom: 20rpx;
        image {
          height: 32rpx;
          width: 32rpx;
          padding-left: 6px;
          padding-right: 10px;
        }
        text {
          // font-family: PingFangSC-Regular;
          font-size: 14px;
          color: #333333;
          letter-spacing: -0.26px;
        }
      }
      .cardBody {
        width: 100%;
        min-height: 300rpx;
        display: flex;
        align-items: center;
        justify-content: space-between;
        .goodInfo {
          width: 390rpx;
          display: flex;
          flex-direction: row;
          justify-content: flex-start;
          padding-left: 6px;
7a7226fea   范牧   冲突合并 
421
a3d2beaa8   范牧   立即支付功能 
422
423
424
425
 
          .imageWrap {
            height: 188rpx;
            width: 188rpx;
            margin-right: 28rpx;
7a7226fea   范牧   冲突合并 
426
a3d2beaa8   范牧   立即支付功能 
427
428
429
430
431
432
433
434
435
436
437
438
 
            image {
              border-radius: 4px;
              height: 188rpx;
              width: 188rpx;
            }
          }
          .infoRight {
            display: flex;
            flex-direction: column;
            align-items: flex-start;
            justify-content: space-between;
            min-height: 240rpx;
22e1420fa   BigBoss   弹窗组件修改 
439
 
  		  width: 100%;
a3d2beaa8   范牧   立即支付功能 
440
441
442
443
444
445
446
447
448
449
450
 
            .goodName {
              display: -webkit-box;
              -webkit-box-orient: vertical;
              -webkit-line-clamp: 2;
              text-align: justify;
              overflow: hidden;
              font-size: 28rpx;
              color: #333333;
            }
            .describ {
              width: 100%;
0bda9efec   BigBoss   购物车功能修改 
451
 
              min-height: 80rpx;
22e1420fa   BigBoss   弹窗组件修改 
452
453
454
455
 
  			background: #F9F9F9;
  			border-radius: 2px;
              box-sizing: border-box;
              padding: 10rpx;
a3d2beaa8   范牧   立即支付功能 
456
457
 
              font-size: 20rpx;
              letter-spacing: -0.23px;
a3d2beaa8   范牧   立即支付功能 
458
 
              color: #999999;
22e1420fa   BigBoss   弹窗组件修改 
459
460
461
462
463
464
465
466
 
  			display: flex;
  			justify-content: space-between;
  			align-items: center;
  			.desL{
  				
  				view{
  					margin: 10rpx 0 10rpx 0 ;
  				}
0bda9efec   BigBoss   购物车功能修改 
467
 
  			}
22e1420fa   BigBoss   弹窗组件修改 
468
a3d2beaa8   范牧   立即支付功能 
469
470
471
472
473
474
475
476
477
478
479
 
            }
            .priceBox {
              display: flex;
              justify-content: space-between;
              align-items: center;
              // margin-top: 26px;
              width: 100%;
              font-size: 14px;
              color: #999999;
              .maxCount {
                color: #999999;
22e1420fa   BigBoss   弹窗组件修改 
480
 
                font-size: 20rpx;
a3d2beaa8   范牧   立即支付功能 
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
 
              }
              .price {
                color: #ff6b4a;
                font-size: 28rpx;
              }
              .counter {
                display: flex;
                flex-direction: row;
                justify-content: space-between;
                align-items: center;
                font-size: 28rpx;
                color: #333333;
                width: 122rpx;
                .btn {
                  display: flex;
                  justify-content: center;
                  line-height: 32rpx;
                  height: 32rpx;
                  width: 32rpx;
                  background-color: #f2f2f2;
                  color: #cfcfcf;
                }
              }
            }
          }
        }
      }
    }
a3d2beaa8   范牧   立即支付功能 
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
 
    .footer {
      position: fixed;
      left: 0;
      bottom: 0px;
      height: 112rpx;
      width: 100%;
      background-color: #ffffff;
      font-size: 16px;
      display: flex;
      justify-content: space-between;
      align-items: center;
      .footerLeft {
        display: flex;
        justify-content: center;
        align-items: center;
        width: 50%;
        color: #333333;
        text {
          color: #ff6b4a;
        }
      }
      .footerRight {
        display: flex;
        justify-content: flex-end;
        align-items: center;
        width: 50%;
        margin-right: 26rpx;
        .paybtn {
          display: flex;
          justify-content: center;
          align-items: center;
          background: #ff6b4a;
          border-radius: 20px;
          border-radius: 20px;
          color: #ffffff;
          width: 204rpx;
          height: 80rpx;
        }
      }
    }
  }
22e1420fa   BigBoss   弹窗组件修改 
550
551
552
553
554
555
 
  /* 隐藏滚动条 */
   ::-webkit-scrollbar {
  	width: 0;
  	height: 0;
  	color: transparent;
    }
7a7226fea   范牧   冲突合并 
556
 
  </style>