update上线更新

xuxueyang

2024-08-28 7e738f69cf7b353492edefa1768005f19ea7e7ee

 sub_pages/customer/shopping/confirm.vue

@@ -2,6 +2,7 @@
   import {
      mapState
   } from 'vuex'
   import environments from '@/environments'

   export default {
      name: "订单详情",
@@ -41,11 +42,34 @@
            this.loadTransportList()
            this.cacheAddressId = this.address.id
         }
         // 
         //先获取直接的全部地址
         // @ApiModelProperty(value = "订单商品")
         //   private List<FlowerCartListDTO> flowers;
         // @ApiModelProperty(value = "打包费")
         //   private BigDecimal packing;

         // 两种情况,我合伙人是A,我进入页面前改成了B,我进去后还是获取了A——可以通过

         if (this.currentInfo.customerDTO && this.currentInfo.customerDTO.partnerId) {
            // 考虑一下，由后台实时获取，如果获取的合伙人id不一样，那么就刷新当前用户信息。

            this.$http.request('get', '/api/current/customer/partner', {
               params: {
                  // id: this.currentInfo.customerDTO.partnerId
               }
            }).then(async res => {
               if (res.code == 0) {
                  this.partnerInfo = res.data || {}
                  if (this.partnerInfo.id !== this.currentInfo.customerDTO.partnerId) {
                     //刷新用户信息
                     await this.$store.dispatch('getCurrentInfo')
                  }
               }
            })


         }

      },
      data() {
@@ -65,6 +89,7 @@
            need_columns: [
               []
            ],
            partnerInfo: {},

         }
      },
@@ -126,7 +151,7 @@
            }

            if (!this.address.id) {
               this.$message.showToast('请选择收货地址',{
               this.$message.showToast('请选择收货地址', {
                  duration: 2000
               })
               return
@@ -152,16 +177,25 @@
                     if (code === 0) {
                        //提交信息
                        console.log('pay,', data)
                        if (data && data['_testOrderId']) {
                        // /api/pub/init/callback?orderId=
                        // if(env.pro)
                        if (false && data && (data['_testV2OrderId'] || data['_testOrderId']) &&
                           environments.httpBaseUri.startsWith(
                              'http://47.99.58.211/flower')) {
                           //回调
                           tmp.$message.showLoading()
                           const res2 = await tmp.$http.request('get',
                              '/api/customer/flower/order/callback/tmp', {
                              '/api/pub/init/callback', {
                                 params: {
                                    id: res2.data['_testOrderId']
                                    orderId: data['_testV2OrderId'] || data[
                                       '_testOrderId'] || ''
                                 }
                              })
                           tmp.$message.hideLoading()
                           tmp.$message.showToast('支付成功')
                           //返回上一页
                           await tmp.$store.dispatch('sign_add', 'shopping')
                           uni.navigateBack()
                        } else if (data) {
                           wx.requestPayment({
                              ...data,
@@ -234,6 +268,35 @@
               </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"
            v-if="!currentInfo.customerDTO||!currentInfo.customerDTO.partnerId">
@@ -267,13 +330,7 @@
         <view class="p10 bg-white m-t-20 br-4">
            <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
               }">
@@ -429,6 +486,7 @@

         .transform-list {
            overflow-x: scroll;

            .transform-item {
               background: rgba(225, 240, 231, 0.38);
               border-radius: 8rpx;
@@ -450,6 +508,7 @@
                  color: #000000;
                  line-height: 40rpx;
                  word-break: break-word;
                  min-height: 90rpx
               }

               .price {