jiangping
2024-07-29 d9a89d83c2048a964f16ca179feb2b7f21b9d33a
提交
已修改9个文件
213 ■■■■■ 文件已修改
wechat_jiaxuan/components/disCase/index.js 69 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_jiaxuan/components/disCase/index.wxml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_jiaxuan/components/disRealpic/index.wxml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_staff/components/disCase/index.js 59 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_staff/components/disCase/index.wxml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_staff/components/disRealpic/index.js 62 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_staff/pages/store/staff.less 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_staff/pages/store/staff.wxml 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_staff/pages/store/staff.wxss 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_jiaxuan/components/disCase/index.js
@@ -11,7 +11,7 @@
    activeParam: [],
    selParam: '',
    tagCodes: [],
    isLoading :false,
    cateList: [],
    dataList: [],
@@ -42,6 +42,10 @@
      })
    },
    getList() {
      if(this.data.isLoading){
        return
      }
      this.setData({isLoading:true})
      const { sortType, query, tagCodes, pageNum, pageSize, catalogCode } = this.data
      getZhongTaiWholecasePage({
        catalogCode, pageNum, pageSize, tagCodes, sortType, query
@@ -52,6 +56,8 @@
            dataList: [...this.data.dataList, ...res.data.records],
          })
        }
      }).finally(()=>{
        this.setData({isLoading:false})
      })
    },
    scrolltolower() {
@@ -90,48 +96,65 @@
      })
    },
    tagClick(e) {
      if(this.data.isLoading){
        return
      }
      const code = e.currentTarget.dataset.code
      const paramIndex = e.currentTarget.dataset.index
      const { cateList, tagCodes, activeParam, activeIndex } = this.data
      const index = tagCodes.indexOf(code)
      if (index === -1) {
        // 同param里code重复
        if (activeParam && activeParam.length > 0) {
          activeParam.forEach(item => {
            const indexTemp = tagCodes.indexOf(item.labelValueCode)
            if (indexTemp > -1) {
              tagCodes.splice(indexTemp, 1)
            }
          })
        }
        tagCodes.push(code)
        cateList[activeIndex].paramIndex = paramIndex
        cateList[activeIndex].paramName = activeParam[paramIndex].labelValueName
        // // 同param里code重复
        // if (activeParam && activeParam.length > 0) {
        //   activeParam.forEach(item => {
        //     const indexTemp = tagCodes.indexOf(item.labelValueCode)
        //     if (indexTemp > -1) {
        //       tagCodes.splice(indexTemp, 1)
        //     }
        //   })
        // }
        // tagCodes.push(code)
        cateList[activeIndex].tempParamIndex = paramIndex
        cateList[activeIndex].tempParamName = activeParam[paramIndex].labelValueName
        cateList[activeIndex].tempParamCode = code
      } else {
        tagCodes.splice(index, 1)
        cateList[activeIndex].paramIndex = -1
        cateList[activeIndex].paramName = ''
        // tagCodes.splice(index, 1)
        cateList[activeIndex].tempParamIndex = -1
        cateList[activeIndex].tempParamName = null
        cateList[activeIndex].tempParamCode = null
      }
      this.setData({ pageNum: 1, dataList: [], total: 0 })
      this.setData({ tagCodes, cateList })
      // this.setData({ pageNum: 1, dataList: [], total: 0 })
      this.setData({cateList })
      console.log('tagCodes', tagCodes)
    },
    cancelParam() {
      const { cateList } = this.data
      cateList.forEach(item => {
        item.paramIndex = -1
        item.paramName = item.paramName || ''
        item.tempParamIndex =item.paramIndex
        item.tempParamName =item.paramName
        item.tempParamCode =item.paramCode
      })
      this.setData({ tagCodes: [], activeParam: [], cateList, activeIndex: -1 })
      this.setData({ activeParam: [],cateList , activeIndex: -1 })
    },
    bindblur() {
      this.setData({ pageNum: 1, dataList: [], total: 0 })
      this.getList()
    },
    subParam() {
    subParam() {
      this.setData({ activeParam: [] })
      this.setData({ pageNum: 1, activeIndex: -1, dataList: [], total: 0 })
      const { cateList } = this.data
      var codes = []
      cateList.forEach(item => {
        item.paramIndex =item.tempParamIndex
        item.paramName =item.tempParamName
        item.paramCode =item.tempParamCode
        if(item.paramIndex >-1 && item.paramCode){
          codes.push(item.paramCode)
        }
      })
      this.setData({tagCodes:codes, pageNum: 1, activeIndex: -1, dataList: [], total: 0 })
      this.getList()
    },
    changeShowParams(e) {
wechat_jiaxuan/components/disCase/index.wxml
@@ -11,7 +11,7 @@
      <scroll-view class="query_wrap_scroll" scroll-x>
        <view class="query_wrap">
          <view data-index="{{ index }}" wx:for="{{ cateList }}" class="item" bindtap="changeShowParams">
            <view class="name">{{ item.paramName || item.labelName }}</view>
            <view class="name">{{ item.tempParamName || item.labelName }}</view>
            <van-icon name="{{ activeIndex === index ? 'arrow-up' : 'arrow-down' }}" />
          </view>
        </view>
@@ -19,7 +19,7 @@
      <!--  param -->
      <view wx:if="{{ activeParam && activeParam.length > 0 }}" class="query_param">
        <view class="list">
          <view data-index="{{index}}" data-code="{{ item.labelValueCode }}" bindtap="tagClick" wx:for="{{ activeParam }}" class="item {{ cateList[activeIndex].paramIndex === index ? 'active' : '' }}">{{ item.labelValueName }}</view>
          <view data-index="{{index}}" data-code="{{ item.labelValueCode }}" bindtap="tagClick" wx:for="{{ activeParam }}" class="item {{ cateList[activeIndex].tempParamIndex === index ? 'active' : '' }}">{{ item.labelValueName }}</view>
        </view>
        <view class="btns">
          <view class="btn" bindtap="cancelParam">取消</view>
wechat_jiaxuan/components/disRealpic/index.wxml
@@ -12,7 +12,7 @@
      <scroll-view class="query_wrap_scroll" scroll-x>
        <view class="query_wrap">
          <view data-index="{{ index }}" wx:for="{{ cateList }}" class="item" bindtap="changeShowParams">
            <view class="name">{{ item.paramName || item.labelName }}</view>
            <view class="name">{{ item.tempParamName || item.labelName }}</view>
            <van-icon name="{{ activeIndex === index ? 'arrow-up' : 'arrow-down' }}" />
          </view>
        </view>
@@ -20,7 +20,7 @@
      <!--  param -->
      <view wx:if="{{ activeParam && activeParam.length > 0 }}" class="query_param">
        <view class="list">
          <view data-index="{{index}}" data-code="{{ item.labelValueCode }}" bindtap="tagClick" wx:for="{{ activeParam }}" class="item {{ cateList[activeIndex].paramIndex === index ? 'active' : '' }}">{{ item.labelValueName }}</view>
          <view data-index="{{index}}" data-code="{{ item.labelValueCode }}" bindtap="tagClick" wx:for="{{ activeParam }}" class="item {{ cateList[activeIndex].tempParamIndex === index ? 'active' : '' }}">{{ item.labelValueName }}</view>
        </view>
        <view class="btns">
          <view class="btn" bindtap="cancelParam">取消</view>
wechat_staff/components/disCase/index.js
@@ -12,7 +12,7 @@
    selParam: '',
    tagCodes: [],
    isLoading:false,
    cateList: [],
    dataList: [],
    total: 0,
@@ -42,6 +42,11 @@
      })
    },
    getList() {
      if(this.data.isLoading){
        return
      }
      this.setData({isLoading:true})
      const { sortType, query, tagCodes, pageNum, pageSize,catalogCode } = this.data
      getZhongTaiWholecasePage({
        catalogCode,pageNum,pageSize,tagCodes, sortType,query
@@ -52,6 +57,8 @@
            dataList: [...this.data.dataList, ...res.data.records],
          })
        }  
      }).finally(()=>{
        this.setData({isLoading:false})
      })
    },
    scrolltolower() {
@@ -90,40 +97,34 @@
      })
    },
    tagClick(e) {
      if(this.data.isLoading){
        return
      }
      const code = e.currentTarget.dataset.code
      const paramIndex = e.currentTarget.dataset.index
      const { cateList, tagCodes, activeParam, activeIndex } = this.data
      const index = tagCodes.indexOf(code)
      
      if(index === -1){
        // 同param里code重复
        if(activeParam && activeParam.length > 0){
          activeParam.forEach(item => {
            const indexTemp = tagCodes.indexOf(item.labelValueCode)
            if(indexTemp > -1){
              tagCodes.splice(indexTemp, 1)
            }
          })
        }
        tagCodes.push(code)
        cateList[activeIndex].paramIndex = paramIndex
        cateList[activeIndex].paramName = activeParam[paramIndex].labelValueName
      }else{
        tagCodes.splice(index, 1)
        cateList[activeIndex].paramIndex = -1
        cateList[activeIndex].paramName = ''
      if(index === -1){
        cateList[activeIndex].tempParamIndex = paramIndex
        cateList[activeIndex].tempParamName = activeParam[paramIndex].labelValueName
        cateList[activeIndex].tempParamCode = code
      } else {
        cateList[activeIndex].tempParamIndex = -1
        cateList[activeIndex].tempParamName = null
        cateList[activeIndex].tempParamCode = null
      }
      this.setData({ tagCodes, cateList })
      this.setData({cateList })
      console.log('tagCodes', tagCodes);
    },
    cancelParam() {
      const { cateList } = this.data
      console.log('cateList', cateList);
      cateList.forEach(item => {
        item.paramIndex = -1
        item.paramName = item.paramName || ''
        item.tempParamIndex =item.paramIndex
        item.tempParamName =item.paramName
        item.tempParamCode =item.paramCode
      })
      this.setData({ tagCodes: [],activeParam: [],cateList,activeIndex: -1 })
      this.setData({ activeParam: [],cateList , activeIndex: -1 })
    },
    bindblur() {
      this.setData({ pageNum: 1,dataList: [],total: 0})
@@ -131,7 +132,17 @@
    },
    subParam() {
      this.setData({ activeParam: [] })
      this.setData({ pageNum: 1,activeIndex: -1,dataList: [],total: 0})
      const { cateList } = this.data
      var codes = []
      cateList.forEach(item => {
        item.paramIndex =item.tempParamIndex
        item.paramName =item.tempParamName
        item.paramCode =item.tempParamCode
        if(item.paramIndex >-1 && item.paramCode){
          codes.push(item.paramCode)
        }
      })
      this.setData({tagCodes:codes, pageNum: 1, activeIndex: -1, dataList: [], total: 0 })
      this.getList()
    },
    changeShowParams(e){
wechat_staff/components/disCase/index.wxml
@@ -11,7 +11,7 @@
      <scroll-view class="query_wrap_scroll" scroll-x>
        <view class="query_wrap">
          <view data-index="{{ index }}" wx:for="{{ cateList }}" class="item" bindtap="changeShowParams">
            <view class="name">{{ item.paramName || item.labelName }}</view>
            <view class="name">{{ item.tempParamName || item.labelName }}</view>
            <van-icon name="{{ activeIndex === index ? 'arrow-up' : 'arrow-down' }}" />
          </view>
        </view>
@@ -19,7 +19,7 @@
      <!--  param -->
      <view wx:if="{{ activeParam && activeParam.length > 0 }}" class="query_param">
        <view class="list">
          <view data-index="{{index}}" data-code="{{ item.labelValueCode }}" bindtap="tagClick" wx:for="{{ activeParam }}" class="item {{ cateList[activeIndex].paramIndex === index ? 'active' : '' }}">{{ item.labelValueName }}</view>
          <view data-index="{{index}}" data-code="{{ item.labelValueCode }}" bindtap="tagClick" wx:for="{{ activeParam }}" class="item {{ cateList[activeIndex].tempParamIndex === index ? 'active' : '' }}">{{ item.labelValueName }}</view>
        </view>
        <view class="btns">
          <view class="btn" bindtap="cancelParam">取消</view>
wechat_staff/components/disRealpic/index.js
@@ -11,7 +11,7 @@
    activeParam: [],
    selParam: '',
    tagCodes: [],
    isLoading:false,
    cateList: [],
    dataList: [],
@@ -41,6 +41,11 @@
      })
    },
    getList() {
      if(this.data.isLoading){
        return
      }
      this.setData({isLoading:true})
      const { sortType, query, tagCodes, pageNum, pageSize,catalogCode } = this.data
      getZhongTaiRealcasePage({
        catalogCode,tagCodes,pageNum,pageSize, sortType,query
@@ -49,6 +54,8 @@
          dataList: [...this.data.dataList, ...res.data.records],
          total: res.data.total,
        })
      }).finally(()=>{
        this.setData({isLoading:false})
      })
    },
    scrolltolower() {
@@ -121,44 +128,59 @@
      }
    },
    tagClick(e) {
      if(this.data.isLoading){
        return
      }
      const code = e.currentTarget.dataset.code
      const paramIndex = e.currentTarget.dataset.index
      const { cateList, tagCodes, activeParam, activeIndex } = this.data
      const index = tagCodes.indexOf(code)
      
      if(index === -1){
        if(activeParam && activeParam.length > 0){
          activeParam.forEach(item => {
            const indexTemp = tagCodes.indexOf(item.labelValueCode)
            if(indexTemp > -1){
              tagCodes.splice(indexTemp, 1)
            }
          })
        }
        tagCodes.push(code)
        cateList[activeIndex].paramIndex = paramIndex
        cateList[activeIndex].paramName = activeParam[paramIndex].labelValueName
        // if(activeParam && activeParam.length > 0){
        //   activeParam.forEach(item => {
        //     const indexTemp = tagCodes.indexOf(item.labelValueCode)
        //     if(indexTemp > -1){
        //       tagCodes.splice(indexTemp, 1)
        //     }
        //   })
        // }
        // tagCodes.push(code)
        cateList[activeIndex].tempParamIndex = paramIndex
        cateList[activeIndex].tempParamName = activeParam[paramIndex].labelValueName
        cateList[activeIndex].tempParamCode = code
      }else{
        tagCodes.splice(index, 1)
        cateList[activeIndex].paramIndex = -1
        cateList[activeIndex].paramName = ''
        cateList[activeIndex].tempParamIndex = -1
        cateList[activeIndex].tempParamName = null
        cateList[activeIndex].tempParamCode = null
      }
      this.setData({ tagCodes, cateList })
      this.setData({  cateList })
    },
    cancelParam() {
      const { cateList } = this.data
      cateList.forEach(item => {
        item.paramIndex = -1
        item.paramName = item.paramName || ''
        item.tempParamIndex = item.paramIndex
        item.tempParamName =   item.paramName
        item.tempParamCode =   item.paramCode
      })
      this.setData({ tagCodes: [],activeParam: [],cateList,activeIndex: -1 })
      this.setData({    activeParam: [],cateList,activeIndex: -1 })
    },
    bindblur() {
      this.setData({ pageNum: 1,dataList: [],total: 0})
      this.getList()
    },
    subParam() {
      this.setData({ activeParam: [] })
      const { cateList } = this.data
      var codes =[]
      cateList.forEach(item => {
        item.paramIndex = item.tempParamIndex
        item.paramName =   item.tempParamName
        item.paramCode =   item.tempParamCode
        if(item.tempParamIndex >-1 && item.tempParamCode){
          codes.push(item.tempParamCode)
        }
      })
      this.setData({ activeParam: [],tagCodes:codes })
      this.setData({ pageNum: 1,activeIndex: -1,dataList: [],total: 0})
      this.getList()
    },
wechat_staff/pages/store/staff.less
@@ -111,6 +111,9 @@
      font-weight: 600;
      font-size: 40rpx;
      display: flex;
      align-items: flex-end; /* 这会使子元素底部对齐 */
      justify-content: center; /* 这会使子元素水平居中 */
    }
  }
}
wechat_staff/pages/store/staff.wxml
@@ -25,7 +25,8 @@
      <view class="card">
      <image src="../../static/images/mingpian_bg_kehu.png" class="bg"></image>
        <view>服务客户</view>
        <view class="num" wx:if="{{ userInfo.costomerNum || userInfo.costomerNum == 0 }}">{{ userInfo.costomerNum || '--' }}+</view>
        <view class="num" wx:if="{{ userInfo.costomerNum || userInfo.costomerNum == 0 }}">{{ userInfo.costomerNum || '--' }}+
        </view>
        <view wx:else class="num">--</view>
      </view>
    </view>
wechat_staff/pages/store/staff.wxss
@@ -187,8 +187,11 @@
  font-size: 26rpx;
  color: #999999;
  text-align: center;
  align-items: flex-end; /* 这会使子元素底部对齐 */
  justify-content: center; /* 这会使子元素水平居中 */
}
.card_wrap {
  position: fixed;
  border-radius: 8rpx;