update

xuxueyang

2024-08-01 e876fed618abd4237b9818424b72d01e24f8908c

 sub_pages/customer/shopping/confirm.vue

@@ -37,7 +37,7 @@
               value: ''
            })
         })
         if(this.address.id){
         if (this.address.id) {
            this.loadTransportList()
            this.cacheAddressId = this.address.id
         }
@@ -74,6 +74,12 @@
               this.loadTransportList()
               this.cacheAddressId = nv.id

            } else if (!nv.id) {
               //说明id清空了
               if (!this.cacheAddressId) {
                  transportList = []
                  this.cacheAddressId = ''
               }
            }
         }
      },
@@ -84,8 +90,11 @@
            this.dto.specialNeeds = e.value[0].value
         },
         async loadTransportList() {
            if (this.currentInfo.customerDTO && this.currentInfo.customerDTO.partnerId) {
               return
            }
            let that = this;
            console.log('address', that.address, that.cacheAddressId)
            // console.log('address', that.address, that.cacheAddressId)
            if (that.address && that.address.id && that.cacheAddressId !== that.address.id) {
               that.$message.showLoading()
               const {
@@ -107,12 +116,19 @@
         },
         async submitOrder() {
            console.log('submitOrder', this.dto)
            if (!this.dto.transportId) {
               this.$message.showToast('请选择配送方式')
               return
            if (this.currentInfo.customerDTO && this.currentInfo.customerDTO.partnerId) {

            } else {
               if (!this.dto.transportId) {
                  this.$message.showToast('请选择配送方式')
                  return
               }
            }

            if (!this.address.id) {
               this.$message.showToast('请选择收货地址')
               this.$message.showToast('请选择收货地址',{
                  duration: 2000
               })
               return
            }
            this.dto.addressId = this.address.id
@@ -156,9 +172,11 @@
                                 await tmp.$store.dispatch('sign_add', 'shopping')
                                 uni.navigateBack()
                              },
                              fail(err) {
                              async fail(err) {
                                 console.error('pay fail', err)
                                 tmp.$message.showToast('支付失败')
                                 await tmp.$store.dispatch('sign_add', 'shopping')
                                 uni.navigateBack()
                              }
                           })

@@ -187,8 +205,8 @@
      </view>
      <view>
         <view class="flower-container m-t-12 br-4 p10">
            <view class="shopping-item m-b-20" v-for="(item,index) of dto.flowers" :key="index">
               <u-divider v-if="index>0"></u-divider>
            <view class="shopping-item " v-for="(item,index) of dto.flowers" :key="index">
               <!-- <view class="line-gray" v-if></view> -->
               <view class="sup-title flex">
                  <image class="icon-dp img100 m-r-10" src="/static/common/icon-dp.png"></image>
                  <view>{{ item.supplierName || '-' }}</view>
@@ -217,7 +235,8 @@
            </view>
         </view>
         <!--    查看商品列表，和选择运费 -->
         <view class="br-4 transform-container m-t-12 p10">
         <view class="br-4 transform-container m-t-12 p10"
            v-if="!currentInfo.customerDTO||!currentInfo.customerDTO.partnerId">
            <view class="title">
               <view>运输方式：</view>
               <view class="flex transform-list flex-wrap-normal">
@@ -323,6 +342,8 @@
         background-color: #ffffff;
         left: 0rpx;
         padding: 20rpx;
         z-index: 99;
         z-index: 11;
         right: 0rpx;
         bottom: 0rpx;
      }
@@ -331,7 +352,7 @@
         background-color: #ffffff;

         .shopping-item {
            padding: 28rpx 22rpx;
            padding: 10rpx 22rpx;
            position: relative;

            .sup-title {
@@ -407,6 +428,7 @@
         background-color: #ffffff;

         .transform-list {
            overflow-x: scroll;
            .transform-item {
               background: rgba(225, 240, 231, 0.38);
               border-radius: 8rpx;
@@ -420,6 +442,7 @@
               margin-right: auto;
               max-width: 32%;
               width: 130rpx;
               min-width: 130rpx;

               .title {
                  font-weight: 400;
@@ -451,13 +474,10 @@
         .transform-list:nth-child(3n+2) {
            margin-right: 0;
         }
			
         .desc-red{
				
         }
         .desc{
				
         }

         .desc-red {}

         .desc {}
      }

   }