update 兑换券的（之后还有会员价格）

xuxueyang

2024-09-03 1625b684412694851576dc2f2812b4d20c577803

 pages/order/order-detail.vue

@@ -153,26 +153,27 @@
                  var tryCallWx = false
                  // #ifdef MP
                  let tmp = this
                  if (wx.openBusinessView&&false) {
                  if (wx.openBusinessView && tmp.dto && tmp.dto.paymentTrId) {
                     tryCallWx = true
                     wx.openBusinessView({
                        businessType: 'weappOrderConfirm',
                        extraData: {
                           merchant_id: '1230000109',
                           merchant_trade_no: '1234323JKHDFE1243252',
                           transaction_id: '420123123123123123123'
                           // merchant_id: '',
                           // merchant_trade_no: '',
                           transaction_id: tmp.dto && tmp.dto.paymentTrId || ''
                        },
                        success() {
                        async success() {
                           //dosomething
                           // 发送请求
                           tmp.$message.showLoading()
                           const {
                              code
                           } = await tmp.$http.request('get', '/api/customer/order/receive/confirm', {
                              params: {
                                 id: tmp.id,
                              }
                           })
                           } = await tmp.$http.request('get',
                              '/api/customer/order/receive/confirm', {
                                 params: {
                                    id: tmp.id,
                                 }
                              })
                           tmp.$message.hideLoading()
                           if (code === 0) {
                              tmp.getDetail()
@@ -222,6 +223,7 @@
                        id: this.id,
                     }
                  })
						
                  this.$message.hideLoading()
                  if (code === 0) {
                     //微信接口
@@ -230,10 +232,8 @@
                        ...data,
                        async success(res) {
                           console.log('pay success', res)
                           that.$message.showToast('支付成功')
                           setTimeout(() => {
                              that.getDetail()
                           }, 200)
                           await that.$message.showToast('支付成功')
                           that.getDetail()
                        },
                        fail(err) {
                           console.error('pay fail', err)
@@ -394,12 +394,13 @@
            })
            this.$message.hideLoading()
            if (code == 0) {
               this.$message.showToast('提交成功')
               this.showSales = false
               this.$forceUpdate()
               setTimeout(() => {
                  uni.navigateBack()
               }, 1200)
               await this.$message.showToast('提交成功')
               uni.navigateBack()
               // this.showSales = false
               // this.$forceUpdate()
               // setTimeout(() => {
                  // uni.navigateBack()
               // }, 1200)
            }
         },
      },
@@ -434,59 +435,64 @@
            </view>
         </view>
      </view>
      <view class="flower-info m-b-20 m-t-12 br-4" v-for="(item,index) of list" :key="index">
         <view class="supplier-name ">
            <image class="icon-dp" src="/static/common/icon-dp.png"></image>
            {{ item.supplierName || ''}}
         </view>
         <view class="flex m-t-12">
            <radio v-if="showSales" disabled :checked="submitForm.orderItemId == item.id"></radio>
            <!-- @click="changeSalesOrderItem(item)" -->
            <!-- :checked="submitForm.orderItems.indexOf(item.id)>=0" -->
      <view v-for="(item,index) of list" :key="index">
         <view class="flower-info m-b-20 m-t-12 br-4" v-if="!showSales||showSales&&(submitForm.orderItemId == item.id)">
            <view class="supplier-name ">
               <image class="icon-dp" src="/static/common/icon-dp.png"></image>
               {{ item.supplierName || ''}}
            </view>
            <!-- submitForm.orderItemId:{{submitForm.orderItemId}} -->
            <!-- itemId:{{item.id}} -->
            <view class="flex m-t-12">
               <!-- <radio v-if="showSales" disabled :checked="submitForm.orderItemId == item.id"></radio> -->
               <!-- @click="changeSalesOrderItem(item)" -->
               <!-- :checked="submitForm.orderItems.indexOf(item.id)>=0" -->

            <image class="flower-img img100 br-4 m-r-6" :src="item.flowerCover"
               @click="previewImg(item.flowerCover)">
            </image>
            <view class="flex1">
               <view class=" flex">
                  <view class="title"><span class="level">{{ item.flowerCategory || ''}}</span><span
                        class="level">{{ item.flowerLevelStr || ''}}</span>{{ item.flowerName || ''}}
                  </view>
               </view>
               <view class="each-list">
                  <view class="each-item">
                     <view class="label">货位号</view>
                     <view class="value">{{ item.warehouseLocationCode || dto.warehouseLocationCode  || '-' }}
               <image class="flower-img img100 br-4 m-r-6" :src="item.flowerCover"
                  @click="previewImg(item.flowerCover)">
               </image>
               <view class="flex1">
                  <view class=" flex">
                     <view class="title"><span class="level">{{ item.flowerCategory || ''}}</span><span
                           class="level">{{ item.flowerLevelStr || ''}}</span>{{ item.flowerName || ''}}
                     </view>
                  </view>
                  <view class="each-list">
                     <view class="each-item">
                        <view class="label">货位号</view>
                        <view class="value">
                           {{ item.warehouseLocationCode || dto.warehouseLocationCode  || '-' }}
                        </view>
                     </view>

                  <view class="each-item">
                     <view class="label">颜色</view>
                     <view class="value">{{ item.flowerColor || '-' }}</view>
                     <view class="each-item">
                        <view class="label">颜色</view>
                        <view class="value">{{ item.flowerColor || '-' }}</view>

                  </view>
                  <view class="each-item">
                     <view class="label">规格</view>
                     <view class="value">{{ item.flowerUnit || '-' }}</view>
                  </view>
                     </view>
                     <view class="each-item">
                        <view class="label">规格</view>
                        <view class="value">{{ item.flowerUnit || '-' }}</view>
                     </view>

                  <view class="each-item">
                     <view class="label">数量</view>
                     <view class="value">{{ item.num || 0 }}</view>
                     <view class="each-item">
                        <view class="label">数量</view>
                        <view class="value">{{ item.num || 0 }}</view>

                  </view>
                  <view class="each-item">
                     <view class="label">售价</view>
                     <view class="value">￥{{ item.price || '-' }}</view>
                  </view>
                  <view class="each-item">
                     <view class="label">总金额</view>
                     <view class="value t-red">￥{{ item.total || '-' }}</view>
                     </view>
                     <view class="each-item">
                        <view class="label">售价</view>
                        <view class="value">￥{{ item.price || '-' }}</view>
                     </view>
                     <view class="each-item">
                        <view class="label">总金额</view>
                        <view class="value t-red">￥{{ item.total || '-' }}</view>
                     </view>
                  </view>
               </view>
            </view>
         </view>

         </view>
      </view>
      <view class="info-container bg-white br-4" v-if="!showSales">
         <view class="form-item">