1.增加类别和花名搜索

陶杰

2024-11-12 767ca1416d96ff1d2f8d346c0a1bdd36bc6557f5

 pages/home/supplier-home.vue

@@ -39,8 +39,25 @@

            <view class="name">
               <view class="t1">
                  {{ (!!currentInfo.supplierDTO?(currentInfo.supplierDTO.name):"") || currentInfo.nickName || currentInfo.loginName || '-'}}<span
                     v-if="currentInfo.supplierDTO&&currentInfo.supplierDTO.status!=='P'">
                  <!-- {{ (!!currentInfo.supplierDTO?(currentInfo.supplierDTO.name):"") || currentInfo.nickName || currentInfo.loginName || '-'}} -->
                  <span v-if="currentInfo.partnerDTO && currentInfo.partnerDTO.name">
                     {{ currentInfo.partnerDTO.name }}
                  </span>
                  <span v-else-if="currentInfo.supplierDTO && currentInfo.supplierDTO.name">
                     {{ currentInfo.supplierDTO.name }}
                  </span>
                  <span v-else-if="currentInfo.customerDTO && currentInfo.customerDTO.name">
                     {{ currentInfo.customerDTO.name }}
                  </span>
                  <span v-else-if="currentInfo.nickName">
                     {{ currentInfo.nickName }}
                  </span>
                  <span v-else-if="currentInfo.loginName">
                     {{ currentInfo.loginName }}
                  </span>
                  <span v-else>-</span>

                  <span v-if="currentInfo.supplierDTO&&currentInfo.supplierDTO.status!=='P'">
                     ({{currentInfo.supplierDTO?currentInfo.supplierDTO.statusStr:''}})</span>
                  <span v-if="currentInfo.partnerDTO&&currentInfo.partnerDTO.status!=='P'">
                     ({{currentInfo.partnerDTO?currentInfo.partnerDTO.statusStr:''}})</span>
@@ -58,7 +75,7 @@
      </view>
      <view class="item-container" :class="[selftype?selftype:'']">
         <view class="title">我的收益</view>
         <view class="flex tj-container" v-if="selftype==='partner'">.
         <view class="flex tj-container" v-if="selftype==='partner'">
            <view class="tj-each">
               <view class="num total">
                  ￥{{tj.income||'0.00'}}
@@ -73,7 +90,7 @@
         <view class="line"></view>

         <view class="flex tj-container" v-if="selftype==='supplier'">
            <view class="tj-each">
            <view class="tj-each"  @click="goto('/sub_pages/supplier/data-statis/data-statis',true)">
               <view class="num">
                  {{tj.dealCountLastMonth||0}}扎
               </view>
@@ -81,7 +98,7 @@
                  上月成交
               </view>
            </view>
            <view class="tj-each">
            <view class="tj-each"  @click="goto('/sub_pages/supplier/data-statis/data-statis',true)">
               <view class="num">
                  {{tj.dealCountToday||0}}扎
               </view>
@@ -89,7 +106,7 @@
                  今日成交
               </view>
            </view>
            <view class="tj-each">
            <view class="tj-each"  @click="goto('/sub_pages/supplier/data-statis/data-statis',true)">
               <view class="num">
                  {{tj.dealCountDay30||0}}扎
               </view>
@@ -153,7 +170,7 @@
               @click="goto('/sub_pages/partner/order-manage/order-manage',true)">
               <view class="img-c">
                  <image class="icon margin-bottom order-icon ddgl"
                     src="/static/images/partner/user/user-icon-ddgl.png" mode="scaleToFill" />
                     src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/23/23a7ad86e00c4ba28cd962dc4910433cuser-icon-ddgl.png" mode="scaleToFill" />
               </view>
               <view class="order-desc tg">订单管理</view>
            </view>
@@ -161,7 +178,7 @@
               @click="goto('/sub_pages/supplier/order-manage/order-manage',true)">
               <view class="img-c">
                  <image class="icon margin-bottom order-icon ddgl"
                     src="/static/images/partner/user/user-icon-ddgl.png" mode="scaleToFill" />
                     src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/23/23a7ad86e00c4ba28cd962dc4910433cuser-icon-ddgl.png" mode="scaleToFill" />
               </view>
               <view class="order-desc tg">订单统计</view>
            </view>
@@ -170,14 +187,14 @@
               @click="goto('/sub_pages/supplier/order-settlement/order-settlement',true)">
               <view class="img-c">
                  <image class="icon margin-bottom order-icon zdjs"
                     src="/static/images/supplier/user/user-icon-zdjs.png" mode="scaleToFill" />
                     src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/7b/7b7ed1488fd64f6fa9bc6b557f141f37user-icon-zdjs.png" mode="scaleToFill" />
               </view>
               <view class="order-desc tg">账单结算</view>
            </view>
            <view class="nav row margin-tb" @click="toFlowManage" v-if="selftype==='supplier'">
               <view class="img-c">
                  <image class="icon margin-bottom order-icon spgl"
                     src="/static/images/supplier/user/user-icon-spgl.png" mode="scaleToFill" />
                     src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/47/478e007ad07a43ea9f40a962d83cedb4user-icon-spgl.png" mode="scaleToFill" />
               </view>
               <view class="order-desc cqw">商品管理</view>
            </view>
@@ -185,24 +202,43 @@
               @click="goto('/sub_pages/partner/markup-config/markup-config',true)">
               <view class="img-c">
                  <image class="icon margin-bottom order-icon jjpz"
                     src="/static/images/partner/user/user-icon-jjpz.png" mode="scaleToFill" />
                     src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/93/93356ec339074b49b04c1a3a37146f22user-icon-jjpz.png" mode="scaleToFill" />
               </view>
               <view class="order-desc tg">加价配置</view>
            </view>
            <view class="nav row margin-tb" @click="goto('/pages/order/order-sale/order-sale',true)">
               <view class="img-c">
                  <image class="icon margin-bottom order-icon shlp"
                     src="/static/images/supplier/user/user-icon-shlp.png" mode="scaleToFill" />
                     src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/47/47b54c52e4c2430c8f9e91645fbf9ebduser-icon-shlp.png" mode="scaleToFill" />
               </view>
               <view class="order-desc syst">售后理赔</view>
            </view>
	
            <!-- <view class="nav row margin-tb" @click="printDeliveryOrder">
               <view class="img-c">
                  <image class="icon margin-bottom order-icon kkjl"
                     src="/static/images/supplier/user/user-icon-kkjl.png" mode="scaleToFill" />
                     src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/22/22db478554ec436a8c7e6e89c346767duser-icon-kkjl.png" mode="scaleToFill" />
               </view>
               <view class="order-desc wbsp">测试蓝牙</view>
            </view> -->
         </view>
         <view class="flex order-icons m-t-12">
            <view class="nav row margin-tb" v-if="selftype==='supplier'" @click="goto('/sub_pages/supplier/wallet/my-wallet',true)">
               <view class="img-c">
                  <image class="icon margin-bottom order-icon shlp"
                     src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/8d/8d72f2df8a4348ac90bfbfb553a9cc71qianbao.png" mode="scaleToFill" />
               </view>
               <view class="order-desc syst">我的钱包</view>
            </view>
            <view class="nav row margin-tb">
					
            </view>
            <view class="nav row margin-tb">
					
            </view>
            <view class="nav row margin-tb">
					
            </view>
         </view>
      </view>

@@ -260,7 +296,7 @@
      },
      async onPullDownRefresh() {
         await this.$store.dispatch('getCurrentInfo')
         await getTj(true)
         await this.getTj(true)
         uni.stopPullDownRefresh()
      },
      onLoad(options) {