xuxueyang
2024-08-04 17bb1250f2120415e5fc9f47fe50b60f72b47a07
sub_pages/customer/shopping/confirm.vue
@@ -37,11 +37,28 @@
               value: ''
            })
         })
         if (this.address.id) {
            this.loadTransportList()
            this.cacheAddressId = this.address.id
         }
         //
         //先获取直接的全部地址
         // @ApiModelProperty(value = "订单商品")
         //   private List<FlowerCartListDTO> flowers;
         // @ApiModelProperty(value = "打包费")
         //   private BigDecimal packing;
         if (this.currentInfo.customerDTO && this.currentInfo.customerDTO.partnerId) {
            this.$http.request('get', '/api/partner/page/view', {
               params: {
                  id: this.currentInfo.customerDTO.partnerId
               }
            }).then(res => {
               if (res.code == 0) {
                  this.partnerInfo = res.data || {}
               }
            })
         }
      },
      data() {
@@ -61,6 +78,7 @@
            need_columns: [
               []
            ],
            partnerInfo: {},
         }
      },
@@ -70,6 +88,12 @@
               this.loadTransportList()
               this.cacheAddressId = nv.id
            } else if (!nv.id) {
               //说明id清空了
               if (!this.cacheAddressId) {
                  transportList = []
                  this.cacheAddressId = ''
               }
            }
         }
      },
@@ -80,8 +104,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 {
@@ -103,12 +130,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
@@ -152,9 +186,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()
                              }
                           })
@@ -183,8 +219,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>
@@ -212,8 +248,38 @@
               </view>
            </view>
         </view>
         <view class="p10 bg-white m-t-20 br-4" v-if="partnerInfo&&partnerInfo.id">
            <view class="form-item  flex ">
               <view class="label">仓位名称</view>
               <view class="m-l-a m-r-0 flex desc-gray">
                  <view>{{partnerInfo.cityWarehouse|| '-'}}</view>
               </view>
            </view>
            <view class="form-item  flex ">
               <view class="label">合伙人名称</view>
               <view class="m-l-a m-r-0 flex desc-gray">
                  <view>{{partnerInfo.name|| '-'}}</view>
               </view>
            </view>
            <view class="form-item  flex ">
               <view class="label">联系方式</view>
               <view class="m-l-a m-r-0 flex desc-gray">
                  <view>{{partnerInfo.contactTel|| '-'}}</view>
               </view>
            </view>
            <view class="form-item  flex ">
               <view class="label">提货地址</view>
               <view class="m-l-a m-r-0 flex desc-gray">
                  {{ partnerInfo['province'] || '' }}{{ partnerInfo['city'] && ('/' + partnerInfo['city']) || '' }}{{
                    partnerInfo['region'] && ('/' + partnerInfo['region']) || ''
                  }}{{partnerInfo.address|| '-'}}
               </view>
            </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">
@@ -242,15 +308,9 @@
         </view>
         <view class="p10 bg-white m-t-20 br-4">
            <view class="form-item  ">
            <view class="form-item  flex ">
               <view class="label">特殊需求</view>
               <!--       <view class="m-l-a m-r-0 flex1">
                  <view class="m-t-12 m-b-12">
                     <u-textarea v-model="dto.specialNeeds" placeholder="请输入特殊需求">
                     </u-textarea>
                  </view>
               </view> -->
               <view class="m-l-a m-r-0 flex " :class="[!dto.specialNeeds?'desc-gray':'']" @click="()=>{
                  show_select_need=true
               }">
@@ -319,6 +379,8 @@
         background-color: #ffffff;
         left: 0rpx;
         padding: 20rpx;
         z-index: 99;
         z-index: 11;
         right: 0rpx;
         bottom: 0rpx;
      }
@@ -327,7 +389,7 @@
         background-color: #ffffff;
         .shopping-item {
            padding: 28rpx 22rpx;
            padding: 10rpx 22rpx;
            position: relative;
            .sup-title {
@@ -403,6 +465,8 @@
         background-color: #ffffff;
         .transform-list {
            overflow-x: scroll;
            .transform-item {
               background: rgba(225, 240, 231, 0.38);
               border-radius: 8rpx;
@@ -416,6 +480,7 @@
               margin-right: auto;
               max-width: 32%;
               width: 130rpx;
               min-width: 130rpx;
               .title {
                  font-weight: 400;
@@ -447,13 +512,10 @@
         .transform-list:nth-child(3n+2) {
            margin-right: 0;
         }
         .desc-red{
         }
         .desc{
         }
         .desc-red {}
         .desc {}
      }
   }