jiangping
2024-07-26 a50adedd851b802b8855ed6ea47ea21a7257f00d
提交
已修改13个文件
148 ■■■■ 文件已修改
server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_staff/api/index.js 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_staff/components/buoyClient/index.js 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_staff/components/disRealpic/index.js 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_staff/pages/consult/consult.js 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_staff/pages/detailDis/case.js 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_staff/pages/homeId/index.js 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_staff/pages/kefu/select.js 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_staff/pages/userinfo/index.js 64 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_staff/pages/userinfo/index.wxml 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_staff/pages/userinfo/index.wxss 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_staff/static/icon/ic_select_sel.png 补丁 | 查看 | 原始文档 | blame | 历史
wechat_staff/static/icon/ic_select_sel@2x.png 补丁 | 查看 | 原始文档 | blame | 历史
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")
wechat_staff/api/index.js
@@ -331,9 +331,12 @@
  if(child){ 
    child.freshData();
  }
  const enjoyList = wx.getStorageSync('enjoyList') || [];
  var {info} = obj.data ;
  const index = enjoyList.findIndex( i => i.id === info.id );
   info.isEnjoy = index > -1;
   obj.setData({ info:info})   ;
  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
@@ -38,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
@@ -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{
wechat_staff/pages/detailDis/case.js
@@ -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() {
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/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/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