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

liukangdong

2024-07-26 a812fee59d8051da5a59311ce5d0e0d5def44578

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

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

@@ -147,6 +147,7 @@
        String token = DigestUtils.md5Hex(timestamp+interfaceKey);
        if(!token.equals(sign)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"token已失效!");

        }
        try{
            response.setHeader("Cache-Control", "no-store, no-cache");

 wechat_staff/components/detailFooter/index.js

@@ -55,7 +55,7 @@
      let that = this
      getContentShareImg({
        articleId: `${info.id}_${path}`,
        type: '1',
        type: '0',
        // pageUrl: path,
        imgurl: info.coverImage,
      }).then(res => {
@@ -81,11 +81,27 @@
              that.setData({
                isShowPoster: false
              })
              wx.showToast({
                title: '保存成功',
                icon: 'success',
                duration: 2000
              wx.setClipboardData({
                data:  '          >>精品案例<<\n'
                      +'  🥇精益求精，品质生活🥇\n'
                      +'汇集全国优秀设计师获奖案例\n'
                      +'👉各种风格灵感案例上万套👈\n'
                      +'  总有一套能打动您，适合您',
                success: function (res) {
                  wx.getClipboardData({
                    success: function (res) {
                      wx.showToast({
                        title: '文案已复制成功，去分享吧'
                      })
                    }
                  })
                }
              })
              // wx.showToast({
              //   title: '保存成功',
              //   icon: 'success',
              //   duration: 2000
              // })
            }
          })


 wechat_staff/pages/download/index.js

@@ -47,7 +47,7 @@
        if (item.checked) {
          getContentShareImg({
            articleId: `${downloadConfig.id}_${downloadConfig.path}`,
            type: this.takeQrcode ? 1 : 0,
            type: this.takeQrcode ? 0 : 1,
            imgurl: item.url
          }).then(res => {
            wx.downloadFile({

 wechat_staff/pages/kefu/fond.js

@@ -105,7 +105,7 @@
    let that = this
    getContentShareImg({
      articleId: obj.id + '&' + obj.joinType,
      type: '1',
      type: '0',
      // pageUrl: path,
      imgurl: obj.coverImage,
    }).then(res => {

 wechat_staff/pages/promotion/index.js

@@ -112,7 +112,7 @@
                          }
                        })
                      }
                  })
                    })
                } 
              }, fail(err) { 
                wx.showToast({

 wechat_staff/pages/userinfo/index.js

@@ -41,6 +41,7 @@
    })
  },
  onSubmit() {
    var that = this
    console.log('点了');
    const {
      slogans,
@@ -60,6 +61,7 @@
      this.setData({
        editFalg: false
      })
      that.getUserInfo()
      wx.showToast({
        title: '信息保存成功',
      })

 wechat_staff/pages/userinfo/index.wxml

@@ -20,7 +20,7 @@
      <view class="label">从业年限</view>
      <view class="val">
        <view wx:if="{{ editFalg }}" class="input">
          <van-field wx:if="{{ editFalg }}"  type="text" border="{{false}}" class="input" model:value="{{ jobDate  }}" maxlength="{{ 5 }}" clearable /> 
          <van-field  type="number"  wx:if="{{ editFalg }}"    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">
@@ -34,7 +34,7 @@
    </view>
    <view class="line">
      <view class="label">服务客户</view>
      <van-field wx:if="{{ editFalg }}" type="text" border="{{false}}" class="input" model:value="{{ costomerNum }}" maxlength="{{ 5 }}" clearable />
      <van-field wx:if="{{ editFalg }}" type="number" border="{{false}}" class="input" model:value="{{ costomerNum }}" maxlength="{{ 5 }}" clearable />
      <view wx:else class="input">{{ costomerNum }}</view>
    </view>
    <view class="line">
@@ -53,7 +53,7 @@
      <view class="label">微信二维码</view>
      <view class="val" bindtap="selMedia">
        <view class="input"></view>
        <image wx:if="userInfo.qrcodeImgFull !=null &&userInfo.qrcodeImgFull !='' "  class="qrcode" mode="widthFix" src="{{userInfo.qrcodeImgFull}}"></image>
        <image wx:if="qrcodeImgFull !=null &&qrcodeImgFull !='' "  class="qrcode" mode="widthFix" src="{{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>
@@ -62,7 +62,7 @@
      <view class="label">企业微信二维码</view>
      <view class="val" bindtap="selMedia2">
        <view class="input"></view>
        <image wx:if="userInfo.companyQrcodeImgFull !=null &&userInfo.companyQrcodeImgFull !='' "  class="qrcode" mode="widthFix" src="{{userInfo.companyQrcodeImgFull}}"></image>
        <image wx:if="companyQrcodeImgFull !=null && companyQrcodeImgFull !='' "  class="qrcode" mode="widthFix" src="{{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>