Merge branch 'main' of https://gitee.com/people_3/hmy_farmer

xuxy

2024-08-11 1e97cc472f8b156c464ecfd1c91c1e62f53151f0

 pages/user/supplier-user.vue

@@ -81,30 +81,49 @@
               <view class="m-r-a m-r-0 more" @click="goto('/pages/order/order',true)">全部订单

                  <uni-icons class="" type="right" size="12"></uni-icons>

               </view>

            </view>

            </view>
 
 
				
 
				



            <view class="flex order-icons-container">

               <view class="order-icons" style="position: relative;"

                  @click="goto('/pages/order/order?status=PENDING',true)">

                  <image src="../../static/images/customer/order/order-type-1.png" class="order-icon dfk"

                     style="position: relative;">

                     <view class="image-shop-number" v-if="order_pendding_num">{{order_pendding_num||''}}</view>

                     <view class="image-shop-number" v-if="tj_order.pendingCount">{{tj_order.pendingCount||''}}</view>

                  </image>

                  <view>待付款</view>

               </view>

               <view class="order-icons" @click="goto('/pages/order/order?status=SEND',true)">

                  <image src="../../static/images/customer/order/order-type-2.png" class="order-icon dfh"></image>

                  <image src="../../static/images/customer/order/order-type-2.png" class="order-icon dfh">
                     <view class="image-shop-number" v-if="tj_order.sendCount">{{tj_order.sendCount||''}}</view>
							
                  </image>

                  <view>待发货</view>

               </view>

               <view class="order-icons" @click="goto('/pages/order/order?status=RECEIVE',true)">

                  <image src="../../static/images/customer/order/order-type-3.png" class="order-icon dsh"></image>

                  <image src="../../static/images/customer/order/order-type-3.png" class="order-icon dsh">
                     <view class="image-shop-number" v-if="tj_order.receiveCount">{{tj_order.receiveCount||''}}</view>
							
                  </image>

                  <view>待收货</view>

               </view>

               <view class="order-icons" @click="goto('/pages/order/order?status=EVALUATE',true)">

                  <image src="../../static/images/customer/order/order-type-4.png" class="order-icon dpj"></image>

                  <image src="../../static/images/customer/order/order-type-4.png" class="order-icon dpj">
                     <view class="image-shop-number" v-if="tj_order.evaluateCount">{{tj_order.evaluateCount||''}}</view>
							
                  </image>

                  <view>待评价</view>

               </view>

               <view class="order-icons" @click="goto('/pages/order/order-sale/order-sale',true)">

                  <image src="../../static/images/customer/order/order-type-5.png" class="order-icon sh"></image>

                  <image src="../../static/images/customer/order/order-type-5.png" class="order-icon sh">
                     <view class="image-shop-number" v-if="tj_order.salesPendingCount">{{tj_order.salesPendingCount||''}}</view>
							
                  </image>

                  <view>售后</view>

               </view>

            </view>

@@ -173,7 +192,8 @@
            </view>

         </view>

         <!-- #ifdef PUB_PARTNER -->

         <view class="user-util m-t-12 flex" v-if="selftype==='partner'"

         <view class="user-util m-t-12 flex"

            v-if="selftype==='partner'&&currentInfo.partnerDTO&&currentInfo.partnerDTO.id&&currentInfo.partnerDTO.status=='P'"

            @click="goto('/sub_pages/partner/partner-info/partner-code',true)">

            <view class="title">推广的注册二维码</view>

            <view class="right-icon">

@@ -331,9 +351,10 @@
            inviterName: '',

            // StatusBar:0,

            tel: '15974805814',

            tj: {},

            tj: {},
            tj_order:{},

            cacheUserId: '',

            order_pendding_num: 0,

            // order_pendding_num: 0,



         };

      },

@@ -364,7 +385,8 @@
      // #ifdef PUB_CUSTOMER

      onShareAppMessage() {

         let that = this;

         var name = that.currentInfo.customerDTO&&that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO&&that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO&&that.currentInfo.partnerDTO.name || ''
         var name = that.currentInfo.customerDTO && that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&

            that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && that.currentInfo.partnerDTO.name || ''

         var url =

            `/pages/home/home?shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数

         return {

@@ -374,8 +396,8 @@
      },

      onShareTimeline() {

         let that = this;

         var name = that.currentInfo.customerDTO && that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&
            that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && that.currentInfo.partnerDTO.name || ''
         var name = that.currentInfo.customerDTO && that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&

            that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && that.currentInfo.partnerDTO.name || ''

         var url =

            `/pages/home/home?shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数

         return {

@@ -385,6 +407,7 @@
      },

      // #endif

      onShow() {

         this.cacheUserId = ''

         this.getTj()

      },

      onLoad(options) {

@@ -510,12 +533,13 @@
                     }

                  })

                  //获取待支付数目

                  this.$http.request('get', '/api/customer/order/count/pending', {



                  this.$http.request('get', '/api/customer/order/statistics/count', {

                     params: {}

                  }).then(res => {

                     if (res.code === 0) {

                        that.order_pendding_num = res.data || 0



                        // that.order_pendding_num = res.data || 0

                        that.tj_order = res.data || {}

                     }

                  })