Blame view

src/pages/myOrderPaying/myOrderPaying.vue 17.9 KB
058f060df   范牧   冲突修改
1
  <!-- 订单待付款  待收货 -->
4de4be344   喻鹏   客服在线和我的订单-待付款
2
  <template>
1a4cad719   BigBoss   修改待付款支付跳转逻辑&新增已完成...
3
4
5
6
7
8
9
10
11
12
13
14
15
    <view class="content">
  	  <view
  	    class="headerBanner"
  	    v-if="status == '2'||'3'"
  	  >
  	    <view class="bannerLeft">
  	      <view class="T1">订单已完成</view>
  	    </view>
  	    <image
  	      src="../../static/car.png"
  	      mode="aspectFill"
  	    ></image>
  	  </view>
eed6c3ca9   BigBoss   订单列表添加支付和取消功能,修改订...
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
  		  <!-- 待付款 -->
  		  <view class="order-time" v-if="status == '0'" >
  		    <text>请在</text>
  		    <uni-countdown
  		      color="#EC5D3B"
  		      splitor-color="#EC5D3B"
  		      :show-day="false"
  		      :hour="0"
  		      :second="getLeftTime"
  		      @timeup="timeup" >
  		  	</uni-countdown>
  		  	
  		    <text>内完成付款</text>
  		  </view>
  		  
1a4cad719   BigBoss   修改待付款支付跳转逻辑&新增已完成...
31
      <view class="headerBanner" v-if="status == '1'">
058f060df   范牧   冲突修改
32
33
        <view class="bannerLeft">
          <view class="T1">卖家已发货</view>
1a4cad719   BigBoss   修改待付款支付跳转逻辑&新增已完成...
34
          <!-- <view class="T2">还剩 确认收货</view> -->
058f060df   范牧   冲突修改
35
36
37
38
39
        </view>
        <image
          src="../../static/car.png"
          mode="aspectFill"
        ></image>
1a4cad719   BigBoss   修改待付款支付跳转逻辑&新增已完成...
40
41
42
      </view>
  	
  	
7d6833f2c   范牧   地址列表
43
44
45
      <view class="order">
        <view class="order-user">
          <view class="order-user-head">
058f060df   范牧   冲突修改
46
47
            <text class="p1">{{orderAddressInfo.userName}}</text>
            <text class="p2">{{orderAddressInfo.telNumber}}</text>
7d6833f2c   范牧   地址列表
48
49
50
          </view>
          <view class="order-user-body">
            <image src="../../static/myorder-paying-location.png"></image>
058f060df   范牧   冲突修改
51
52
            <text class="p3">{{orderAddressInfo.provinceName}} {{orderAddressInfo.cityName}} {{orderAddressInfo.countyName}}
  {{orderAddressInfo.detailInfo}}</text>
7d6833f2c   范牧   地址列表
53
54
55
          </view>
        </view>
        <view class="order-info">
058f060df   范牧   冲突修改
56
57
58
59
60
61
62
63
64
          <view
            class="order-info-head"
            v-for="(orderInfoListItem,index) in orderInfoList"
            :key="index"
          >
            <image
              :src="orderInfoListItem.imgUrl"
              mode="aspectFill"
            ></image>
7d6833f2c   范牧   地址列表
65
            <view class="order-info-head-r">
058f060df   范牧   冲突修改
66
              <text class="p1">{{orderInfoListItem.p_name}}</text>
7d6833f2c   范牧   地址列表
67
68
69
70
71
72
73
              <view
                class="p2"
                style="margin: 0;"
              >
                规格:玫瑰金 / 钛合金 / 防日光防紫外线 / 超薄超轻
                <!-- <view class="arrow"></view> -->
              </view>
058f060df   范牧   冲突修改
74
75
76
77
              <view class="infoText-bottom">
                <view class="markPrice">{{orderInfoListItem.nowPrice}}</view>
                <view class="buy-num">X {{orderInfoListItem.num}}</view>
              </view>
7d6833f2c   范牧   地址列表
78
79
            </view>
          </view>
058f060df   范牧   冲突修改
80
81
82
          <!-- <view class="order-info-goodsnum">
              <text>X1</text>
          </view> -->
7d6833f2c   范牧   地址列表
83
84
          <text class="order-info-freight">
            <text class="p1">运费</text>
a3d2beaa8   范牧   立即支付功能
85
            <text class="p2">免运费</text>
7d6833f2c   范牧   地址列表
86
87
88
          </text>
          <text class="order-info-discount">
            <text class="p1">优惠</text>
058f060df   范牧   冲突修改
89
            <text class="p2">-¥{{totalDiscount}}</text>
7d6833f2c   范牧   地址列表
90
91
92
          </text>
          <text class="order-info-price">
            <text class="p1">实付</text>
607bc3a4d   BigBoss   修改了直接购买的流程,添加弹窗,选...
93
            <text class="p2">¥{{orderInfo.order_info.total_fee}}</text>
54c9be564   BigBoss   修改冲突
94

7d6833f2c   范牧   地址列表
95
96
          </text>
          <text class="order-info-num">
37ccd9675   尹聃   订单详情页获取数据
97
            <text>订单号:{{payId}}</text>
7d6833f2c   范牧   地址列表
98
99
          </text>
          <text class="order-info-time">
eed6c3ca9   BigBoss   订单列表添加支付和取消功能,修改订...
100
            <text>下单时间:{{orderInfo.order_info?orderInfo.order_info.pay_time:'' | timerChange}}</text>
7d6833f2c   范牧   地址列表
101
102
103
104
105
106
107
108
          </text>
          <view class="order-info-hr"></view>
          <view class="order-info-contact">
            <image src="../../static/myorder-paying-contact.png"></image>
            <text>联系客服</text>
          </view>
        </view>
      </view>
058f060df   范牧   冲突修改
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
      <view
        class="order-confim"
        v-if="status == '0'"
      >
        <button
          class="b1"
          @click="cancleOrder"
        >取消订单</button>
        <button
          class="b2"
          @click="paylog"
        >立即支付</button>
      </view>
  
      <view
        class="order-confim"
        v-if="status == '1'"
      >
        <!-- <button class="b1">取消订单</button> -->
        <button
          class="b2"
          @click="confirmOrder"
        >确认收货</button>
1a4cad719   BigBoss   修改待付款支付跳转逻辑&新增已完成...
132
133
134
135
136
137
138
139
140
141
142
      </view>
  	<view
  	  class="order-confim"
  	  v-if="status == '2'"
  	>
  	  <button
  	    class="b2"
  	    @click="toDetail"
  	  >再次购买</button>
  	</view>
  	
7d6833f2c   范牧   地址列表
143
    </view>
4de4be344   喻鹏   客服在线和我的订单-待付款
144
145
146
  </template>
  
  <script>
34703a767   BigBoss   订单逻辑修改
147
148
  import store from "@/store";
  import MD5Util from '../../utils/md5'
92d01cfd5   Adam   修正订单数据
149
  import UniCountdown from "../../components/UniCountdown/UniCountdown.vue";
7d6833f2c   范牧   地址列表
150
151
  export default {
    components: {
92d01cfd5   Adam   修正订单数据
152
      UniCountdown
34703a767   BigBoss   订单逻辑修改
153
    },
92d01cfd5   Adam   修正订单数据
154
    data() {
7d6833f2c   范牧   地址列表
155
      return {
92d01cfd5   Adam   修正订单数据
156
157
158
159
160
        payId: "",
        payTime: "",
        status: "", // status 0 待付款 1 已发货
        uid: "",
        openid: "",
a3d2beaa8   范牧   立即支付功能
161
        lefttime: 0,
36e559203   BigBoss   逻辑完善
162
        isPay: 0,
eed6c3ca9   BigBoss   订单列表添加支付和取消功能,修改订...
163
  	  orderInfo:{},
34703a767   BigBoss   订单逻辑修改
164
  	  totalPrice:0,
92d01cfd5   Adam   修正订单数据
165
      };
058f060df   范牧   冲突修改
166
    },
36e559203   BigBoss   逻辑完善
167
    onLoad:async function ({payId,status,isPay}) {
607bc3a4d   BigBoss   修改了直接购买的流程,添加弹窗,选...
168
      this.payId = payId
36e559203   BigBoss   逻辑完善
169
      this.status = status
607bc3a4d   BigBoss   修改了直接购买的流程,添加弹窗,选...
170
      this.isPay = isPay
eed6c3ca9   BigBoss   订单列表添加支付和取消功能,修改订...
171
      // console.log('++++++++++++++++++',this.status)
058f060df   范牧   冲突修改
172
      const openid = uni.getStorageSync('openid')
36e559203   BigBoss   逻辑完善
173
      const uid = this.$store.state.user.userInfo.uid
058f060df   范牧   冲突修改
174
175
      this.uid = uid
      this.openid = openid
36e559203   BigBoss   逻辑完善
176
      await store.dispatch('orderRead/getOrderInfo', {
058f060df   范牧   冲突修改
177
        pay_id: this.payId,
36e559203   BigBoss   逻辑完善
178
        uid: uid,
92d01cfd5   Adam   修正订单数据
179
        openid: openid
36e559203   BigBoss   逻辑完善
180
      });
34703a767   BigBoss   订单逻辑修改
181
182
183
  	// console.log(this.$store.state.orderRead.orderInfo)
      this.orderInfo = this.$store.state.orderRead.orderInfo
  	this.totalPrice = this.orderInfo.total_fee
058f060df   范牧   冲突修改
184
    },
a3d2beaa8   范牧   立即支付功能
185
186
    // 若从支付页面跳转过来,返回直接返回到首页
    onBackPress(option) {
92d01cfd5   Adam   修正订单数据
187
      if (option.from === "backbutton" && this.isPay) {
a3d2beaa8   范牧   立即支付功能
188
        uni.switchTab({
92d01cfd5   Adam   修正订单数据
189
190
191
          url: "/pages/index/index"
        });
        return true; // 阻止默认返回行为
a3d2beaa8   范牧   立即支付功能
192
193
      }
    },
058f060df   范牧   冲突修改
194
    computed: {
eed6c3ca9   BigBoss   订单列表添加支付和取消功能,修改订...
195
196
      orderInfoList () {
  		return this.orderInfo.order_info?this.orderInfo.order_info.list:null
058f060df   范牧   冲突修改
197
198
      },
      // 获取订单地址信息
eed6c3ca9   BigBoss   订单列表添加支付和取消功能,修改订...
199
200
      orderAddressInfo () {
  		return this.orderInfo.order_info?this.orderInfo.order_info.address:null
058f060df   范牧   冲突修改
201
202
      },
      // 订单付款时间
eed6c3ca9   BigBoss   订单列表添加支付和取消功能,修改订...
203
204
      getLeftTime () {
  		return this.orderInfo.order_info?this.orderInfo.order_info.lefttime:1800
058f060df   范牧   冲突修改
205
206
      },
      // 计算总优惠额
92d01cfd5   Adam   修正订单数据
207
208
209
      totalDiscount() {
        const discountInfoList = this.orderInfo.discount_info;
        let totalDiscount = 0;
058f060df   范牧   冲突修改
210
211
        if (discountInfoList) {
          discountInfoList.map((discountItem, index) => {
92d01cfd5   Adam   修正订单数据
212
213
            totalDiscount += Number(discountItem.value);
          });
058f060df   范牧   冲突修改
214
215
        }
        // console.log(totalDiscount)
92d01cfd5   Adam   修正订单数据
216
217
        return totalDiscount;
      }
1a4cad719   BigBoss   修改待付款支付跳转逻辑&新增已完成...
218
219
220
221
222
223
224
225
226
227
228
    },
    
    methods: {
  	  //再次购买  暂时只支持跳转第一个商品
  	  toDetail(){
  		  const pid = this.orderInfo.order_info.list[0].pid
  	  	uni.navigateTo({
  	  		url: '../details/details?pid='+pid,
  	  		fail: (res) => {console.log(res)},
  	  	});
  	  },
058f060df   范牧   冲突修改
229
      // 取消订单
92d01cfd5   Adam   修正订单数据
230
231
      timeup() {
        this.cancleOrder();
058f060df   范牧   冲突修改
232
      },
92d01cfd5   Adam   修正订单数据
233
234
      cancleOrder() {
        const uid = this.uid;
36e559203   BigBoss   逻辑完善
235
        const openid = this.openid;
a658edc46   BigBoss   。。
236
237
  	  const keyname = this.orderInfo.order_info.keyname
  	  // console.log('keyname',this.orderInfo.keyname)
058f060df   范牧   冲突修改
238
        uni.showModal({
92d01cfd5   Adam   修正订单数据
239
240
241
          title: "提示",
          content: "现在取消,订单不可恢复哦,确认取消吗?",
          success: function(res) {
058f060df   范牧   冲突修改
242
            if (res.confirm) {
92d01cfd5   Adam   修正订单数据
243
              store.dispatch("cancelOrder/cancel", {
36e559203   BigBoss   逻辑完善
244
                keyname: keyname,
058f060df   范牧   冲突修改
245
                uid: uid,
92d01cfd5   Adam   修正订单数据
246
                openid: openid
36e559203   BigBoss   逻辑完善
247
248
249
250
              });
  			uni.navigateBack({
  				delta:1
  			})
058f060df   范牧   冲突修改
251
            } else if (res.cancel) {
92d01cfd5   Adam   修正订单数据
252
              console.log("用户点击取消");
058f060df   范牧   冲突修改
253
            }
92d01cfd5   Adam   修正订单数据
254
255
          }
        });
a3d2beaa8   范牧   立即支付功能
256
      },
36e559203   BigBoss   逻辑完善
257
258
      paylog() {
  		console.log('pay',this.orderInfo)
34703a767   BigBoss   订单逻辑修改
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
  		  const { data, exKeyName: keyName } = this.orderInfo
  		  const uid = uni.getStorageSync('uid')
  		  const timeStamp = new Date().getTime().toString()
  		  const nonceStr = 'asfafasfasfasfasf'
  		  // 支付参数
  		  const fieldSet = {
  		    openid: this.$store.state.user.userInfo.openid,
  		    uid: this.$store.state.user.userInfo.uid,
  		    shopid: 0,
  		    payCate: 2020,
  		    payMoney: this.totalPrice,
  		    payWoodId: `fcdj-${uid}-${keyName}`,
  		    payWoodDesc: '在【非常戴镜】的微信付款凭证',
  		    nonceStr,
  		    signType: 'MD5',
  		    app_uid: 2020,
  		    timeStamp,
  		    keyname: keyName,
  		    billInfo: JSON.stringify(data),
  		  }
  		  // 请求后台支付接口
  		  store.dispatch('order/pay', fieldSet).then(({ data, data2, pay_id: payId }) => {
  		    if (data.return_code === 'SUCCESS' && data.result_code === 'SUCCESS') {
  		      const stringA = `appId=wx115b25aa396d27ac&nonceStr=${nonceStr}&package=prepay_id=${data.prepay_id}&signType=MD5&timeStamp=${timeStamp}`
  		      const stringSignTemp = stringA + '&key=NewMoney2017hatemydaddy123456789'
36e559203   BigBoss   逻辑完善
284
  		
34703a767   BigBoss   订单逻辑修改
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
  		      // 微信支付接口
  		      uni.requestPayment({
  		        appId: data.appid,
  		        timeStamp,
  		        nonceStr,
  		        total_fee: this.totalPrice,
  		        package: `prepay_id=${data.prepay_id}`,
  		        signType: 'MD5',
  		        paySign: MD5Util.MD5(stringSignTemp).toUpperCase(),
  		        success: (res) => {
  		          // 支付成功
  		          uni.showModal({
  		            content: '支付成功',
  		            showCancel: false,
  		          })
  		          // 跳转订单详情页->状态 待收货
  		          uni.reLaunch({
1a4cad719   BigBoss   修改待付款支付跳转逻辑&新增已完成...
302
  		            url: `../myOrderPaying/myOrderPaying?payId=${payId}&status=1&isPay=1`,
34703a767   BigBoss   订单逻辑修改
303
304
305
306
307
308
309
310
311
  		          })
  		        },
  		        fail: (res) => {
  		          // 支付失败
  		          uni.showModal({
  		            content: '支付失败',
  		            showCancel: false,
  		          })
  		          // 跳转订单详情页->刷新本页面
1a4cad719   BigBoss   修改待付款支付跳转逻辑&新增已完成...
312
313
314
  				  // uni.redirectTo({
  				  // 	url: `../myOrderPaying/myOrderPaying?payId=${payId}&status=0&isPay=1`,
  				  // })
34703a767   BigBoss   订单逻辑修改
315
316
317
318
319
320
321
322
323
324
325
326
  		        },
  		        complete: () => {
  		          uni.hideLoading()
  		        },
  		      })
  		    } else {
  		      uni.showModal({
  		        content: '支付失败',
  		        showCancel: false,
  		      })
  		      console.log('支付失败')
  		      uni.hideLoading()
1a4cad719   BigBoss   修改待付款支付跳转逻辑&新增已完成...
327
328
329
  			 //  uni.redirectTo({
  				// url: `../myOrderPaying/myOrderPaying?payId=${payId}&status=0&isPay=1`,
  			 //  })
34703a767   BigBoss   订单逻辑修改
330
331
  		    }
  		  })
36e559203   BigBoss   逻辑完善
332
333
334
335
336
337
338
339
340
341
342
343
  		
  		//修改订单状态 待付款==>待收货
  		store.dispatch("statusConfirm/confirm", {
  		    uid: this.uid,
  		    openid: this.openid,
  		    oldway: "0",
  		    way: "1",
  		    pay_id: this.payId,
  		    judgeContent: "",
  		    orderInfo: this.orderInfo.order_info
  		  })
  		  .then(
34703a767   BigBoss   订单逻辑修改
344
345
346
  		    // setTimeout(() => {
  		    //   uni.navigateBack();
  		    // }, 1500)
36e559203   BigBoss   逻辑完善
347
348
349
350
  		  );
  	},
      confirmOrder() {
  		//确认收货 way1 ==>way2 
92d01cfd5   Adam   修正订单数据
351
352
353
354
355
356
357
358
359
360
        store
          .dispatch("statusConfirm/confirm", {
            uid: this.uid,
            openid: this.openid,
            oldway: "1",
            way: "2",
            pay_id: this.payId,
            judgeContent: "",
            orderInfo: this.orderInfo.order_info
          })
34703a767   BigBoss   订单逻辑修改
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
          .then((res)=>{
  			if(res.data.code === 1){
  				uni.showToast({
  					title:'已确认',
  					mask:true,
  					duration:1500,
  					icon:'success'
  				})
  			}else{
  				uni-uni.showToast({
  					title: '服务器错误,确认失败!',
  					mask:true
  				});
  			}
  			setTimeout(() => {
  			  uni.navigateBack();
  			}, 1500)
  		});
92d01cfd5   Adam   修正订单数据
379
      }
87e0a4103   尹聃   修改订单详情时间戳
380
381
382
    },
    filters: {
      timerChange: function(value) {
92d01cfd5   Adam   修正订单数据
383
384
385
386
387
388
        var newDate = new Date();
        newDate.setTime(value * 1000);
        return newDate.toLocaleString();
      }
    }
  };
4de4be344   喻鹏   客服在线和我的订单-待付款
389
390
391
  </script>
  
  <style lang="scss" scoped>
7d6833f2c   范牧   地址列表
392
  .content {
058f060df   范牧   冲突修改
393
    min-height: 100vh;
7d6833f2c   范牧   地址列表
394
395
    display: flex;
    flex-direction: column;
058f060df   范牧   冲突修改
396
    justify-content: flex-start;
7d6833f2c   范牧   地址列表
397
398
399
400
401
    align-items: center;
    background-color: #f2f2f2;
  }
  
  .order {
7d6833f2c   范牧   地址列表
402
403
    margin-bottom: 112rpx;
    background: #f2f2f2;
058f060df   范牧   冲突修改
404
405
    margin-top: 140rpx;
    width: 670rpx;
7d6833f2c   范牧   地址列表
406
  }
058f060df   范牧   冲突修改
407

7d6833f2c   范牧   地址列表
408
409
410
411
412
413
  .order-time {
    width: 100%;
    height: 140rpx;
    background-color: #fff;
    display: flex;
    justify-content: center;
058f060df   范牧   冲突修改
414
415
416
417
    align-items: center;
    position: fixed;
    top: 0;
    left: 0;
7d6833f2c   范牧   地址列表
418
419
    text {
      // font-family: PingFangSC-Regular;
058f060df   范牧   冲突修改
420
      // margin-top: 48rpx;
7d6833f2c   范牧   地址列表
421
422
423
424
425
426
427
428
429
430
431
432
      font-size: 14px;
      color: #333333;
      letter-spacing: -0.26px;
    }
    .p2 {
      // font-family: DINAlternate-Bold;
      margin: 42rpx 20rpx 0 20rpx;
      font-size: 18px;
      color: #ec5d3b;
      letter-spacing: -0.34px;
    }
  }
058f060df   范牧   冲突修改
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
  .headerBanner {
    width: 100%;
    height: 140rpx;
    background: #4a90e2;
    padding: 26rpx 60rpx 24rpx 60rpx;
    box-sizing: border-box;
    color: #ffffff;
    display: flex;
    justify-content: space-between;
    align-items: center;
    position: fixed;
    top: 0;
    left: 0;
    .bannerLeft {
      font-size: 36rpx;
      display: flex;
      flex-direction: column;
      justify-content: center;
      align-items: center;
      .T2 {
        font-size: 24rpx;
      }
    }
    image {
      height: 56rpx;
      width: 72rpx;
    }
  }
7d6833f2c   范牧   地址列表
461
462
  
  .order-user {
7d6833f2c   范牧   地址列表
463
464
465
466
467
468
469
470
471
    height: 228rpx;
    background: #ffffff;
    border-radius: 14rpx;
    margin: 0 auto;
    margin-top: 20rpx;
    margin-bottom: 20rpx;
    .order-user-head {
      display: flex;
      height: 108rpx;
7d6833f2c   范牧   地址列表
472
473
474
475
476
477
478
479
480
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
      align-items: center;
      margin-left: 126rpx;
      .p1 {
        // font-family: PingFangSC-Regular;
        font-size: 14px;
        color: #333333;
        letter-spacing: -0.26px;
        margin-right: 20rpx;
      }
      .p2 {
        // font-family: PingFangSC-Regular;
        font-size: 14px;
        color: #999999;
        letter-spacing: -0.26px;
      }
    }
    .order-user-body {
      display: flex;
      width: 100%;
      image {
        width: 24px;
        height: 26px;
        margin: 12rpx 32rpx 0 40rpx;
      }
      .p3 {
        // font-family: PingFangSC-Semibold;
        font-size: 14px;
        color: #333333;
        letter-spacing: -0.26px;
      }
    }
  }
  
  .order-info {
7d6833f2c   范牧   地址列表
506
507
508
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
    background-color: #fff;
    box-shadow: 0 0 20rpx 0 rgba(177, 128, 128, 0.06);
    border-radius: 16rpx;
    margin: 0 auto;
    view {
      margin-left: 40rpx;
    }
    text {
      font-size: 14px;
    }
    .order-info-head {
      display: flex;
      padding-top: 40rpx;
      image {
        height: 188rpx;
        width: 188rpx;
      }
      .order-info-head-r {
        margin: 0;
        width: 368rpx;
        margin-left: 24rpx;
        // margin-top: 40rpx;
        text {
          display: block;
        }
        // .arrow{
        // width: 0;
        // height: 0;
        // border-left: 5px transparent;
        // border-right: 5px transparent;
        // border-top: 5px #979797;
        // border-bottom: 0 transparent;
        // border-style: solid;
        // position: relative;
        // // transform: scaleY(-1);
        // }
        // .arrow::after{
        //     content: '';
        //     position: absolute;
        //     top: -6.5px;
        //     left: -5px;
058f060df   范牧   冲突修改
547
548
549
550
551
        //     border-left: 5px transparent;
        //     border-right: 5px transparent;
        //     border-top: 5px #FFFFFF;
        //     border-bottom: 0 transparent;
        //     border-style: solid;
7d6833f2c   范牧   地址列表
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
        // }
        .p1 {
          min-height: 40px;
          // font-family: PingFangSC-Regular;
          font-size: 14px;
          color: #333333;
          letter-spacing: -0.26px;
          line-height: 18px;
          // line-height: 20px;
        }
        .p2 {
          height: 34px;
          padding: 1px 0 3px 0;
          // font-family: PingFangSC-Regular;
          font-size: 12px;
          color: #999999;
          letter-spacing: -0.23px;
        }
058f060df   范牧   冲突修改
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
        .infoText-bottom {
          display: flex;
          flex-direction: row;
          justify-content: flex-start;
          align-items: center;
          width: 100%;
          margin-left: 0;
          .markPrice {
            font-size: 14px;
            color: #ff6b4a;
            margin-right: 20rpx;
            margin-left: 0rpx;
          }
          .buy-num {
            font-size: 12px;
            color: #999999;
          }
7d6833f2c   范牧   地址列表
587
588
589
590
        }
      }
    }
    // .order-info-goodsnum {
058f060df   范牧   冲突修改
591
592
593
594
595
596
597
598
599
600
    //     display: flex;
    //     align-items: center;
    //     justify-content: flex-end;
    //     text {
    //         margin-right: 44rpx;
    //         // ont-family: PingFangSC-Regular;
    //         font-size: 12px;
    //         color: #999999;
    //         letter-spacing: -0.23px;
    //     }
7d6833f2c   范牧   地址列表
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
    // }
    .order-info-freight {
      display: block;
      margin-left: 40rpx;
      margin-top: 22rpx;
      .p1 {
        // font-family: PingFangSC-Regular;
        font-size: 14px;
        color: #333333;
        letter-spacing: -0.26px;
        line-height: 18px;
        margin-right: 24px;
      }
      .p2 {
        // font-family: PingFangSC-Regular;
        font-size: 14px;
        color: #ff6b4a;
        letter-spacing: -0.26px;
      }
    }
    .order-info-discount {
      display: block;
      margin-left: 40rpx;
      margin-top: 24rpx;
      .p1 {
        // font-family: PingFangSC-Regular;
        font-size: 14px;
        color: #333333;
        letter-spacing: -0.26px;
        line-height: 18px;
        margin-right: 24px;
      }
      .p2 {
        // font-family: PingFangSC-Regular;
        font-size: 14px;
        color: #ff6b4a;
        letter-spacing: -0.26px;
      }
    }
    .order-info-price {
      display: block;
      margin-left: 40rpx;
      margin-top: 24rpx;
      .p1 {
        // font-family: PingFangSC-Semibold;
        font-size: 14px;
        color: #333333;
        letter-spacing: -0.26px;
        line-height: 18px;
        margin-right: 24px;
      }
      .p2 {
        // font-family: PingFangSC-Semibold;
        font-size: 14px;
        color: #ff6b4a;
        letter-spacing: -0.26px;
      }
    }
    .order-info-num {
      display: block;
      margin-left: 40rpx;
      margin-top: 44rpx;
      text {
        // font-family: PingFangSC-Regular;
        font-size: 12px;
        color: #999999;
        letter-spacing: -0.23px;
      }
    }
    .order-info-time {
      display: block;
      margin: 8rpx 0 48rpx 40rpx;
      text {
        // font-family: PingFangSC-Regular;
        font-size: 12px;
        color: #999999;
        letter-spacing: -0.23px;
      }
    }
    .order-info-hr {
      width: 520rpx;
      height: 1px;
      background-color: #e9e9e9;
      margin-bottom: 20rpx;
    }
    .order-info-contact {
      display: flex;
      padding-bottom: 28rpx;
      image {
        width: 19px;
        height: 16px;
      }
      text {
        // font-family: PingFangSC-Regular;
        margin-left: 20rpx;
        font-size: 14px;
        color: #333333;
        letter-spacing: -0.26px;
        line-height: 18px;
      }
    }
  }
4de4be344   喻鹏   客服在线和我的订单-待付款
703

7d6833f2c   范牧   地址列表
704
705
706
  .order-confim {
    display: flex;
    align-items: center;
058f060df   范牧   冲突修改
707
708
    justify-content: flex-end;
    // z-index: 999;
7d6833f2c   范牧   地址列表
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
    width: 100%;
    height: 112rpx;
    position: fixed;
    bottom: 0;
    background: #ffffff;
    button {
      width: 204rpx;
      height: 80rpx;
      border: 1px solid #ff6b4a;
      border-radius: 40rpx;
      font-size: 32rpx;
      letter-spacing: -0.3px;
      margin-right: 0;
    }
    .b1 {
      // font-family: PingFangSC-Regular;
      color: #ff6b4a;
058f060df   范牧   冲突修改
726
      background-color: #ffffff;
7d6833f2c   范牧   地址列表
727
728
729
730
731
732
733
734
    }
    .b2 {
      // font-family: PingFangSC-Regular;
      background-color: #ff6b4a;
      color: #ffffff;
      margin: 0 26rpx 0 20rpx;
    }
  }
4de4be344   喻鹏   客服在线和我的订单-待付款
735
  </style>