Merge remote-tracking branch 'origin/nbncPda' into nbncPda

野心家

2024-11-20 324945af3a5eee3f6e58843823a1e6ffa3a96b21

 pages/order/orderComb.vue

@@ -113,7 +113,7 @@
               <view class="popup-item">
                  <view class="popup-item-left">数量:</view>
                  <view class="popup-item-right" style="border: none;justify-content: center;">
                     <uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474"
                     <uni-number-box :value="count" :step='1' :max="9999999" color="#747474"
                        @change="changeValue" />
                  </view>
               </view>
@@ -243,7 +243,7 @@
         getOrderNoList() {
            let that = this
            uni.request({
               url: this.baseUrl + '/order/list/all',
               url: this.baseUrl + '/order/comb/list/all',
               header: {
                  'token': uni.getStorageSync('token')
               },