Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia

liukangdong

2024-07-26 c7d7aff39b6566d05d3c0a080839c46bb2b6a8aa

Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia

 server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java

@@ -115,8 +115,6 @@
        return ApiResponse.success(newsService.findPage(pageWrap));
    }



    @UserLoginRequired
    @ApiOperation(value = "获取客户管理授权-列表跳转地址", notes = "获取客户管理授权跳转地址")
    @GetMapping("/getCrmAuthUrl")
@@ -159,5 +157,4 @@
            e.printStackTrace();
        }
    }

}

 wechat_staff/api/index.js

@@ -324,3 +324,19 @@
    data
  })
}

export const refreshEnjoy = (obj) =>{
  let child = obj.selectComponent('.buoyClient');
  // 调用子组件中定义的方法 
  if(child){ 
    child.freshData();
  }
  var {info} = obj.data ;
  if(info){
    const enjoyList = wx.getStorageSync('enjoyList') || []; 
    const index = enjoyList.findIndex( i => i.id === info.id );
    info.isEnjoy = index > -1;
    obj.setData({ info:info}) ;
  }
  
}

 wechat_staff/components/buoyClient/index.js

@@ -8,10 +8,10 @@
      type: String,
      value: '0'
    }
  },
  attached() {
    const enjoyList = wx.getStorageSync('enjoyList') || []
    this.setData({ enjoyList })
  }, 
  attached() { 
      const enjoyList = wx.getStorageSync('enjoyList') || []
      this.setData({ enjoyList }) 
  },
  /**
   * 组件的初始数据
@@ -24,6 +24,10 @@
   * 组件的方法列表
   */
  methods: {
    freshData() { 
      const enjoyList = wx.getStorageSync('enjoyList') || []
      this.setData({ enjoyList }) 
  },
    jumpPage(e) {
      const urls = [ '/pages/kefu/fond', '/pages/store/staff' ]
      const i = e.currentTarget.dataset.i
@@ -34,8 +38,7 @@
          wx.navigateTo({
            url: '/pages/webView/index',
            success: function(res) {
              // 通过eventChannel向被打开页面传送数据
              console.log(link)
              // 通过eventChannel向被打开页面传送数据 
              res.eventChannel.emit('data',{link:link} );
            }
          })

 wechat_staff/components/disRealpic/index.js

@@ -74,10 +74,10 @@
      const item = e.currentTarget.dataset.item
      console.log('item', item);
      wx.navigateTo({
        url: '/pages/webView/index?link=' + item.openContent,
        url: '/pages/webView/index',
        success: function(res) {
          // 通过eventChannel向被打开页面传送数据
          res.eventChannel.emit('acceptDataFromOpenerPage', { link: item.openContent, title: item.title })
          // 通过eventChannel向被打开页面传送数据 
          res.eventChannel.emit('data',{link:item.openContent} );
        }
      })
    },
@@ -107,7 +107,11 @@
      }
      if(item.openType == 'link'){
        wx.navigateTo({
          url: '/pages/webView/index?link=' + item.openContent,
          url: '/pages/webView/index',
          success: function(res) {
            // 通过eventChannel向被打开页面传送数据 
            res.eventChannel.emit('data',{link:item.openContent} );
          }
        })
      }
      if(item.openType == 'page'){

 wechat_staff/pages/consult/consult.js

@@ -1,4 +1,4 @@
import { getZhongTaiProductNewsPage, getCatalogList,actionDo } from '../../api/index'
import { getZhongTaiProductNewsPage, getCatalogList,actionDo,refreshEnjoy } from '../../api/index'
Page({

  /**
@@ -60,10 +60,11 @@
    actionDo({actionType: 'view',id: item.id})
    if(item.contentType == 'link'){
      wx.navigateTo({
        url: '/pages/webView/index?link=' + item.content,
        url: '/pages/webView/index',
        success: function(res) {
          // 通过eventChannel向被打开页面传送数据
          res.eventChannel.emit('acceptDataFromOpenerPage', { link: item.openContent, title: item.title })
          // 通过eventChannel向被打开页面传送数据 
          console.log(item)
          res.eventChannel.emit('data',{link:item.content,title:item.title} );
        }
      })
    }else{
@@ -116,7 +117,7 @@
   * 生命周期函数--监听页面显示
   */
  onShow() {

    refreshEnjoy(this) 
  },

  /**

 wechat_staff/pages/consult/consult.wxml

@@ -1,6 +1,6 @@
<view class="container">
  <!-- 悬浮 -->
  <buoyClient />
  <buoyClient class="buoyClient"/>

  <view class="home_top">
    <view class="search_wrap">

 wechat_staff/pages/consult/detail.wxml

@@ -1,6 +1,6 @@
<view>
  <!-- <navBar title="{{ navTitle }}"></navBar> -->
  <buoyClient showPurpose="1" />
  <buoyClient showPurpose="1" class="buoyClient"/>
  <view class="main_content">
    <view class="main_title">{{ info.title }}</view>
    <view class="datetime">发布时间：{{ info.publishDt }}</view>

 wechat_staff/pages/detailDis/case.js

@@ -1,4 +1,4 @@
import { actionDo, getWholecaseInfo } from '../../api/index'
import { actionDo, getWholecaseInfo,refreshEnjoy } from '../../api/index'
Page({

  /**
@@ -30,9 +30,10 @@
    wx.navigateTo({
      url: '/pages/webView/index',
      success: function(res) {
        // 通过eventChannel向被打开页面传送数据
        res.eventChannel.emit('acceptDataFromOpenerPage', { link, title })
      }
        // 通过eventChannel向被打开页面传送数据 
        console.log(link+"--------------------")
        res.eventChannel.emit('data',{link:link,title:title} );
      } 
    })
  },
  openShare() {
@@ -50,11 +51,14 @@
  //   }
  // },
  handleEnjoy(e) {
    const info = this.data.info 
    if(info.id == null ){
      return
    }
    const enjoyList = wx.getStorageSync('enjoyList') || []
    const { type, flag } = e.detail
    console.log('type', type);
    console.log('flag', flag);
    const info = this.data.info
    console.log('flag', flag); 
    if(type == 'enjoy'){
      // 点击了喜欢
      const index = enjoyList.findIndex( i => i.id === info.id )
@@ -72,6 +76,7 @@
        enjoyList.splice(index, 1)
      }
      wx.setStorageSync('enjoyList', enjoyList)
      refreshEnjoy(this) 
    }else{
      actionDo({
        id: info.id,
@@ -129,7 +134,8 @@
   * 生命周期函数--监听页面显示
   */
  onShow() {

    refreshEnjoy(this) 
   
  },

  /**

 wechat_staff/pages/detailDis/case.wxml

@@ -1,5 +1,5 @@
<view class="container">
  <buoyClient showPurpose="1" />
  <buoyClient showPurpose="1" class="buoyClient"/>
  <detailFooter bindenjoy="handleEnjoy" path="1" info="{{info}}" />
  <view class="main_title">{{ info.title }}</view>
  <view class="time">发布时间：{{ info.publishDt }}</view>

 wechat_staff/pages/detailDis/product.js

@@ -1,7 +1,8 @@
import {
  shareContent,
  getProductInfo,
  actionDo
  actionDo,
  refreshEnjoy
} from '../../api/index'
import moment from "moment";
Page({
@@ -13,7 +14,15 @@
    id: '',
    info: {},
    member: {},
    showShare: false
    showShare: false,
    enjoyList: []
  },
  onShow(){
    console.log('onShow')
    refreshEnjoy(this)
  },
  onHide() {
    console.log('onHide')
  },
  /**
   * 生命周期函数--监听页面加载
@@ -34,13 +43,17 @@
      member
    })
  },
  
  //  组件事件
  handleEnjoy(e) {
    const info = this.data.info 
    if(info.id == null ){
      return
    }
    const enjoyList = wx.getStorageSync('enjoyList') || []
    const { type, flag } = e.detail
    console.log('type', type);
    console.log('flag', flag);
    const info = this.data.info
    console.log('flag', flag); 
    if(type == 'enjoy'){
      // 点击了喜欢
      const index = enjoyList.findIndex( i => i.id === info.id )
@@ -58,6 +71,7 @@
        enjoyList.splice(index, 1)
      }
      wx.setStorageSync('enjoyList', enjoyList)
      refreshEnjoy(this)
    }else{
      actionDo({
        id: info.id,

 wechat_staff/pages/detailDis/product.wxml

@@ -1,5 +1,5 @@
<view class="main_app">
  <buoyClient showPurpose="1" />
  <buoyClient class="buoyClient" showPurpose="1" class="buoyClient"/>
  <detailFooter bindenjoy="handleEnjoy" path="0" info="{{info}}" />
  <!-- banner轮播 -->
  <swiper class="banner_swiper" circular indicator-dots autoplay style="height:{{bannerHeight}}rpx" duration>

 wechat_staff/pages/detailDis/realpic.js

@@ -1,4 +1,4 @@
import { getRealcaseInfo, actionDo } from '../../api/index'
import { getRealcaseInfo, actionDo ,refreshEnjoy} from '../../api/index'
Page({

  /**
@@ -15,6 +15,9 @@
  /**
   * 生命周期函数--监听页面加载
   */
  onShow(){
    refreshEnjoy(this) 
  },
  onLoad(options) {
    var app = getApp().globalData
    this.setData({
@@ -43,11 +46,14 @@
    })
  },
  handleEnjoy(e) {
    const info = this.data.info 
    if(info.id == null ){
      return
    }
    const enjoyList = wx.getStorageSync('enjoyList') || []
    const { type, flag } = e.detail
    console.log('type', type);
    console.log('flag', flag);
    const info = this.data.info
    console.log('flag', flag); 
    if(type == 'enjoy'){
      // 点击了喜欢
      const index = enjoyList.findIndex( i => i.id === info.id )
@@ -65,6 +71,7 @@
        enjoyList.splice(index, 1)
      }
      wx.setStorageSync('enjoyList', enjoyList)
      refreshEnjoy(this) 
    }else{
      actionDo({
        id: info.id,

 wechat_staff/pages/detailDis/realpic.wxml

@@ -1,5 +1,5 @@
<view class="container">
  <buoyClient showPurpose="1" />
  <buoyClient showPurpose="1" class="buoyClient"/>
  <detailFooter bindenjoy="handleEnjoy" path="2" info="{{info}}" />
  <!--  -->
  <view class="main_title">{{ info.title }}</view>

 wechat_staff/pages/discover/discover.js

@@ -1,4 +1,4 @@
import { getCataLogTagList, getCatalogList } from '../../api/index'
import { getCataLogTagList, getCatalogList,refreshEnjoy } from '../../api/index'
const { HYEventBus } = require('hy-event-store')
const eventBus = new HYEventBus()
Page({
@@ -18,7 +18,10 @@
    let menuButtonInfo = wx.getMenuButtonBoundingClientRect();
    this.setData({menuButtonInfo})
  }, 
  onShow() {
  
  onShow(){
    console.log('onShow')
    refreshEnjoy(this) 
    let discoverKey = wx.getStorageSync('discoverKey') || ''
    if(discoverKey){
      this.setData({ catalogCode: discoverKey })

 wechat_staff/pages/discover/discover.wxml

@@ -1,5 +1,5 @@
<view class="container">
  <buoyClient />
  <buoyClient class="buoyClient"/>
  <view class="home_tab">
    <view style="height: {{ menuButtonInfo.top - 6 }}px;"></view>
    <view class="main_tab" style="height: {{ menuButtonInfo.height + 12 }}px;">

 wechat_staff/pages/homeId/index.js

@@ -61,7 +61,11 @@
    }
    if(item.contentType == 'link'){
      wx.navigateTo({
        url: '/pages/webView/index?link=' + item.content,
        url: '/pages/webView/index',
        success: function(res) {
          // 通过eventChannel向被打开页面传送数据 
          res.eventChannel.emit('data',{link:item.content} );
        }
      })
    }
    if(item.contentType == 'page'){

 wechat_staff/pages/kefu/fond.js

@@ -24,6 +24,7 @@
      item.checked = false
    })
    wx.setStorageSync('enjoyList', enjoyList)
    console.log(this.data.enjoyList)
    this.initData()
  },

@@ -65,6 +66,7 @@
      }
    })
    wx.setStorageSync('enjoyList', enjoyList)
   
    this.initData()
  },
  itemClick(e) {
@@ -178,6 +180,7 @@
            }
          })
          wx.setStorageSync('enjoyList', enjoyListTemp)
          
          that.initData()
        }
      }
@@ -190,6 +193,7 @@
      item.checked = !item.checked
    })
    wx.setStorageSync('enjoyList', enjoyList)
    
    this.initData()
  },
  openShare() {

 wechat_staff/pages/kefu/fond.wxss

@@ -41,8 +41,10 @@
  overflow: hidden;
  text-overflow: ellipsis;
  display: -webkit-box;
  -webkit-line-clamp: 2;
  -webkit-line-clamp: 2;   
  white-space: break-spaces;
  -webkit-box-orient: vertical;
  word-break: break-word;
}
.date_item .line .content .time {
  font-size: 24rpx;

 wechat_staff/pages/kefu/select.js

@@ -83,11 +83,16 @@
    })
  },
  jumpClient() { 
    getCrmAuthUrl({type:1}).then(res => {
      console.log(res.data)
    getCrmAuthUrl({type:1}).then(res => { 
      this.setData({ url: res.data })
      const url =res.data
      wx.navigateTo({
        url: '/pages/webView/index?link=' + res.data,
        url: '/pages/webView/index',
        success: function(res1) {
          // 通过eventChannel向被打开页面传送数据 
          console.log(url)
          res1.eventChannel.emit('data',{link:url} );
        }
      })
    }) 
  },

 wechat_staff/pages/productVideo/index.js

@@ -1,4 +1,4 @@
import { getZhongTaiVideoPage, getCataLogTagList } from '../../api/index'
import { getZhongTaiVideoPage, getCataLogTagList ,refreshEnjoy} from '../../api/index'
Page({

  /**
@@ -77,7 +77,7 @@
   * 生命周期函数--监听页面显示
   */
  onShow() {

    refreshEnjoy(this)
  },

  /**

 wechat_staff/pages/productVideo/index.json

@@ -1,3 +1,6 @@
{
  "navigationBarTitleText": "产品视频"
  "navigationBarTitleText": "产品视频",
  "usingComponents": { 
    "buoyClient": "../../components/buoyClient/index"
  }
}

 wechat_staff/pages/productVideo/index.wxml

@@ -1,4 +1,5 @@
<view class="container">
  <buoyClient class="buoyClient"/>
  <!-- 分类 -->
  <view>
    <scroll-view scroll-x="true" style="weight: 710rpx;margin-bottom: 30rpx;">

 wechat_staff/pages/userinfo/index.js

@@ -44,17 +44,18 @@
    console.log('点了');
    const {
      slogans,
      costomerNum,
      jobDate,
      costomerNum, 
      userInfo,
      qrcodeImg,
      companyQrcodeImg
    } = this.data
    editMember({
      ...userInfo,
      slogans,
      costomerNum,
      qrcodeImg: qrcodeImg || userInfo.qrcodeImg ,
      companyQrcodeImg: companyQrcodeImg || userInfo.companyQrcodeImg
    editMember({ 
      jobDate:jobDate,
      slogans:slogans,
      costomerNum:costomerNum,
      qrcodeImg: qrcodeImg ,
      companyQrcodeImg: companyQrcodeImg
    }).then(res => {
      this.setData({
        editFalg: false
@@ -69,6 +70,7 @@
      this.setData({
        userInfo: res.data,
        slogans: res.data.slogans,
        jobDate: res.data.jobDate,
        costomerNum: res.data.costomerNum,
        qrcodeImgFull: res.data.qrcodeImgFull,
        qrcodeImg: res.data.qrcodeImg,
@@ -116,6 +118,54 @@
      })
    }
  },
  selMedia3() {
    var that = this
    const {
      userInfo,
      imgurlFull
    } = this.data 
      wx.chooseMedia({
        count: 1,
        mediaType: ['image'],
        sourceType: ['album', 'camera'],
        maxDuration: 16,
        camera: 'back',
        success: (res) => {
          // console.log(res.tempFiles[0].tempFilePath)
          // console.log(res.tempFiles[0].size)
          wx.uploadFile({
            url: uploadUrl,
            filePath: res.tempFiles[0].tempFilePath,
            name: 'file',
            formData: {
              folder: "users"
            },
            header: {
              token: wx.getStorageSync('token')
            },
            success: (ress) => {
              console.log(JSON.parse(ress.data))
              let data = JSON.parse(ress.data)
              userInfo.imgurl = data.data.imgaddr
              userInfo.imgurlFull = data.data.url
              that.setData({userInfo})
              console.log('userInfo', userInfo);
              editMember({
                ...userInfo 
              }).then(res => {
                this.setData({
                  editFalg: false
                })
                wx.showToast({
                  title: '头像更改成功',
                })
              })
            }
          })
        }
      })
    
  },
  selMedia() {
    const {
      editFalg,

 wechat_staff/pages/userinfo/index.wxml

@@ -1,6 +1,7 @@
<view class="container">
  <image class="avatar" src="{{ userInfo.imgurlFull ? userInfo.imgurlFull : '../../static/images/default_avatar.png' }}" mode="widthFix"></image>
  <button open-type="chooseAvatar" bindchooseavatar="getBindchooseavatar" class="avatar_btn">更换头像</button>
  <!-- <button open-type="chooseAvatar" bindchooseavatar="getBindchooseavatar" class="avatar_btn">更换头像</button> -->
  <button bind:tap="selMedia3" class="avatar_btn">更换头像</button>
  <view class="list">
    <view class="line">
      <view class="label">姓名</view>
@@ -12,26 +13,28 @@
    </view>
    <view class="line">
      <view class="label">签名</view>
      <van-field wx:if="{{ editFalg }}" type="text" border="{{false}}" class="input" model:value="{{ slogans }}" maxlength="{{ 18 }}" clearable />
      <van-field wx:if="{{ editFalg }}" type="text" border="{{false}}" class="input" model:value="{{ slogans }}" maxlength="{{ 50 }}" clearable />
      <view wx:else class="input">{{ slogans }}</view>
    </view>
    <view class="line">
      <view class="label">从业年限</view>
      <view class="val">
        <view wx:if="{{ editFalg }}" class="input">
          <picker class="picker" mode="date" value="{{date}}" fields="year" start="1970-09-01" end="{{endDate}}" bindchange="bindDateChange">
          <van-field wx:if="{{ editFalg }}"  type="text" border="{{false}}" class="input" model:value="{{ jobDate  }}" maxlength="{{ 5 }}" clearable /> 
          <view wx:else class="input">{{ jobDate || '0'}}年</view>
          <!-- <picker class="picker" mode="date" value="{{date}}" fields="year" start="1970-09-01" end="{{endDate}}" bindchange="bindDateChange">
            <view class="picker_wrap">
              <view>{{ userInfo.jobDate }} <text wx:if="{{ userInfo.jobDate || userInfo.jobDate == 0 }}">年</text></view>
              <image class="icon" src="../../static/icon/home_ar@2x.png" mode="widthFix"></image>
            </view>
          </picker>
          </picker> -->
        </view>
        <view wx:else class="input"><text>{{ userInfo.jobDate || '0' }} 年</text></view>
      </view>
    </view>
    <view class="line">
      <view class="label">服务客户</view>
      <van-field wx:if="{{ editFalg }}" type="text" border="{{false}}" class="input" model:value="{{ costomerNum || '0'  }}" maxlength="{{ 5 }}" clearable />
      <van-field wx:if="{{ editFalg }}" type="text" border="{{false}}" class="input" model:value="{{ costomerNum }}" maxlength="{{ 5 }}" clearable />
      <view wx:else class="input">{{ costomerNum }}</view>
    </view>
    <view class="line">
@@ -50,16 +53,18 @@
      <view class="label">微信二维码</view>
      <view class="val" bindtap="selMedia">
        <view class="input"></view>
        <image class="qrcode" mode="widthFix" src="../../static/icon/mingpian_erweima@2x.png"></image>
        <image class="icon" src="../../static/icon/home_ar@2x.png" mode="widthFix"></image>
        <image wx:if="userInfo.qrcodeImgFull !=null &&userInfo.qrcodeImgFull !='' "  class="qrcode" mode="widthFix" src="{{userInfo.qrcodeImgFull}}"></image>
        <image wx:else="" class="qrcode" mode="widthFix" src="../../static/icon/mingpian_erweima@2x.png"></image>
        <image  wx:if="{{ editFalg }}"  class="icon" src="../../static/icon/home_ar@2x.png" mode="widthFix"></image>
      </view>
    </view>
    <view class="line">
      <view class="label">企业微信二维码</view>
      <view class="val" bindtap="selMedia2">
        <view class="input"></view>
        <image class="qrcode" mode="widthFix" src="../../static/icon/mingpian_erweima@2x.png"></image>
        <image class="icon" src="../../static/icon/home_ar@2x.png" mode="widthFix"></image>
        <image wx:if="userInfo.companyQrcodeImgFull !=null &&userInfo.companyQrcodeImgFull !='' "  class="qrcode" mode="widthFix" src="{{userInfo.companyQrcodeImgFull}}"></image>
        <image wx:else="" class="qrcode" mode="widthFix" src="../../static/icon/mingpian_erweima@2x.png"></image>
        <image wx:if="{{ editFalg }}"  class="icon" src="../../static/icon/home_ar@2x.png" mode="widthFix"></image>
      </view>
    </view>
    <view wx:if="{{ !editFalg }}" bindtap="startEdit" class="save">编辑</view>

 wechat_staff/pages/userinfo/index.wxss

@@ -38,6 +38,8 @@
  flex: 1;
  color: #111111;
  text-align: right;
  white-space: break-spaces;
  word-break: break-word;
}
.list .line .input .van-cell {
  padding: 0;

 wechat_staff/static/icon/ic_select_sel.png

 wechat_staff/static/icon/ic_select_sel@2x.png

 wechat_staff/utils/config.js

@@ -1,5 +1,5 @@
// export const baseUrl = 'http://192.168.0.135:10027' 
export const baseUrl = 'https://dmtest.ahapp.net/web_interface' // 本地
export const baseUrl = 'http://192.168.0.135:10027' 
// export const baseUrl = 'https://dmtest.ahapp.net/web_interface' // 本地
// export const baseUrl = 'http://zbtest.ahapp.net/zbom_interface/jx/wechat/' //测试服务器

// export const imageUrl = 'https://osswebcdn.zbom.com/jiaxuan/images/'