Merge remote-tracking branch 'origin/master'

jiangping

2024-07-29 a3d2fe9dff3b6cd9fa8fdd91e87aac843f694c0f

Merge remote-tracking branch 'origin/master'

 wechat_jiaxuan/pages/consult/detail.wxml

@@ -1,6 +1,6 @@
<view>
    <!-- 名片 -->
    <idCard users="{{ info.users }}" wx:if="{{ info.users && info.users.id }}" />
    <idCard users="{{ info.users }}" wx:if="{{ origin != 'b' && info.users && info.users.id }}" />
  <view class="main_content">
    <view class="main_title">{{ info.title }}</view>
    <view class="datetime">发布时间：{{ info.publishDt }}</view>

 wechat_jiaxuan/pages/design/design.js

@@ -36,14 +36,15 @@
      success: (res) => {
        console.log('res', res);
        let addr = {
          // provinceCode: codes[0] + '00',
          provinceCode: res.result.ad_info.adcode.slice(0,2) + '000000',
          provinceName: res.result.ad_info.province,
          // cityCode: codes[1] + '00',
          cityCode: res.result.ad_info.adcode.slice(0,4) + '0000',
          cityName: res.result.ad_info.city,
          // areaCode: codes[2] + '00',
          areaCode: res.result.ad_info.adcode + '00',
          areaName: res.result.ad_info.district,
        }
        this.setData({ addr })

      }
    })
  },
@@ -78,15 +79,12 @@
      wx.showToast({
        title: '报名成功'
      })
      setTimeout(() => {
      wx.switchTab({
        url: '/pages/index/index',
      })
      }, 1000)
    })
  },
  // 显示城市弹窗
  chooseCity () {
    this.setData({ showAreaList: !this.data.showAreaList })
    console.log('chooseCity', this.data.showAreaList);
  },
  onFinish(e) {
    const { selectedOptions, value } = e.detail;
@@ -103,6 +101,7 @@
  },
  positionChange (e) {
    console.log(e.detail.value)
    console.log(e.detail.code)
    const names = e.detail.value
    const codes = e.detail.code
    let addr = {

 wechat_jiaxuan/pages/detailDis/case.wxml

@@ -1,6 +1,6 @@
<view class="container">
  <!-- 名片 -->
  <idCard users="{{ info.users }}" wx:if="{{ info.users && info.users.id }}" />
  <idCard users="{{ info.users }}" wx:if="{{ origin != 'b' && info.users && info.users.id }}" />
  <view class="main_title">{{ info.title }}</view>
  <view class="time">发布时间：{{ info.publishDt }}</view>
  <view class="fullview_wrap">
@@ -17,9 +17,9 @@
    <view class="text">{{ info.caseInfo }}</view>
  </view>
  <view class="list">
    <view wx:for="{{ info.apiSpaceCaseVos }}" class="item">
    <view wx:for="{{ info.apiSpaceCaseVos }}" wx:for-index="index" class="item">
      <view class="h1">{{ item.spaceName }}</view>
      <image data-index="{{index}}" data-url="{{ img }}" bindtap="priviewSpace" class="img" wx:for="{{ item.imgList }}" wx:for-item="img" src="{{ img }}" mode="widthFix" />
      <image data-index="{{index}}" data-url="{{ img }}" bindtap="priviewSpace" class="img" wx:for-index="indexb"  wx:for="{{ item.imgList }}" wx:for-item="img" src="{{ img }}" mode="widthFix" />
      <view class="content">{{ item.spaceDesc }}</view>
    </view>
  </view>

 wechat_jiaxuan/pages/detailDis/product.js

@@ -45,7 +45,7 @@
      info
    } = this.data
    wx.previewImage({
      urls: info.imageurlList,
      urls: info.bannerImgList,
      current: url
    })
  },
@@ -55,7 +55,7 @@
      info
    } = this.data
    wx.previewImage({
      urls: info.imageurlList,
      urls: info.spaceList.map(i => i.spaceImg),
      current: url
    })
  },
@@ -125,7 +125,6 @@
    })
  },
  handleShare() {
    console.log('点击了分享');
    actionDo({
      actionType: 'share',
      id: this.data.info.id
@@ -134,13 +133,13 @@
    //   this.setData({showShare: false})
    // })
  },
  // onShareAppMessage: function () {
  //   // let { productDetail, userInfo } = this.data
  //   return {
  //     title: productDetail.title,
  //     path: '/pages/index/index?id=' + productDetail.id + '&shareuserid=' + userInfo.id + '&type=0'
  //   }
  // },
  onShareAppMessage: function () {
    let { info } = this.data
    console.log('点击了分享')
    return {
      path: '/pages/detailDis/product?id=' + info.id + '&userId=' + info.users.id
    }
  },
  onClose() {
    this.setData({
      showShare: false
@@ -198,10 +197,4 @@

  },

  /**
   * 用户点击右上角分享
   */
  onShareAppMessage() {

  }
})

 wechat_jiaxuan/pages/detailDis/product.less

@@ -181,6 +181,7 @@
    position: relative;
    .img{
      width: 100%;
      height: 376rpx;
    }
    .play{
      position: absolute;
@@ -195,6 +196,14 @@
      border-radius: 30rpx;
      font-size: 26rpx;
      color: rgba(255,255,255,0.8);
      display: flex;
      align-items: center;
      justify-content: center;
      .icon{
        width: 14rpx;
        height: 16rpx;
        margin-left: 14rpx;
      }
    }
  }
}
@@ -211,13 +220,12 @@

  .line {
    display: flex;
    height: 32rpx;
    margin-bottom: 24rpx;

    margin-bottom: 20rpx;
    .label { 
      width: auto; 
      width: 120rpx;
      font-size: 24rpx;
      color: #666666;
      flex-shrink: 0;
    }

    .val {

 wechat_jiaxuan/pages/detailDis/product.wxml

@@ -1,6 +1,6 @@
<view class="container">
  <!-- 名片 -->
  <idCard users="{{ info.users }}" wx:if="{{ info.users && info.users.id }}" />
  <idCard users="{{ info.users }}" wx:if="{{ origin != 'b' && info.users && info.users.id }}" />
  <!-- banner轮播 -->
  <view class="swiper_wrap">
    <swiper bindchange="bindchange" class="banner_swiper" circular indicator-dots="{{false}}" autoplay style="height:{{bannerHeight}}rpx" duration>
@@ -23,7 +23,10 @@
    <view class="title">产品视频</view>
    <view class="img_wrap">
      <image class="img" src="{{ info.coverImage }}" mode="widthFix"></image>
      <view bindtap="playVideo" class="play">播放</view>
      <view  class="play">
        <view>播放</view>
        <image bindtap="playVideo" src="../../static/icon/ic_play.png" class="icon"></image>
      </view>
    </view>
  </view>
  <view class="detail">

 wechat_jiaxuan/pages/detailDis/realpic.wxml

@@ -1,6 +1,6 @@
<view class="container">
  <!-- 名片 -->
  <idCard users="{{ info.users }}" wx:if="{{ info.users && info.users.id }}" />
  <idCard users="{{ info.users }}" wx:if="{{ origin != 'b' && info.users && info.users.id }}" />
  <view class="main_title">{{ info.title }}</view>
  <view class="time">发布时间：{{ info.publishDt }}</view>
  <image data-url="{{ item }}" bindtap="priviewSpace" class="info_item" wx:for="{{ info.contentImgList }}" src="{{ item }}" mode="widthFix"></image>

 wechat_staff/components/detailFooter/index.js

@@ -39,7 +39,7 @@
      const { info,  path} = this.data
      wx.navigateToMiniProgram({
        appId: 'wx208dd1edc0be24ee',
        path: `${map[path]}?origin=b&id=${info.id}`,
        path: `${map[path]}?origin=b&id=${info.id}&userId=${wx.getStorageSync('member').id}`,
        envVersion: 'trial'
      })
    },

 wechat_staff/pages/consult/detail.js

@@ -25,7 +25,7 @@
  handleDesign() {
    wx.navigateToMiniProgram({
      appId: 'wx208dd1edc0be24ee',
      path: `/pages/consult/detail?id=${this.data.info.id}&origin=b`,
      path: `/pages/consult/detail?id=${this.data.info.id}&origin=b&userId=${wx.getStorageSync('member').id}`,
      envVersion: 'trial'
    })
  },
@@ -41,7 +41,7 @@
    this.setData({showShare: true})
  },
  handleShare() {
    console.log('点击了分享');
    console.log('点击了分享')
    shareContent(this.data.info.id)
  },
  // onShareAppMessage: function () {

 wechat_staff/pages/detailDis/case.wxml

@@ -18,9 +18,9 @@
      <view class="text">{{ info.caseInfo }}</view>
    </view>
    <view class="list">
      <view wx:for="{{ info.apiSpaceCaseVos }}" class="item">
      <view wx:for="{{ info.apiSpaceCaseVos }}" wx:for-index="index" class="item">
        <view class="h1">{{ item.spaceName }}</view>
        <image data-url="{{ img }}" bindtap="priviewSpace" class="img" wx:for="{{ item.imgList }}" wx:for-item="img" src="{{ img }}" mode="widthFix" />
        <image data-index="{{index}}" data-url="{{ img }}" bindtap="priviewSpace" class="img" wx:for-index="indexb" wx:for="{{ item.imgList }}" wx:for-item="img" src="{{ img }}" mode="widthFix" />
        <view class="content">{{ item.spaceDesc }}</view>
      </view>
    </view>

 wechat_staff/pages/detailDis/product.js

@@ -92,7 +92,7 @@
      info
    } = this.data
    wx.previewImage({
      urls: info.imageurlList,
      urls: info.bannerImgList,
      current: url
    })
  },
@@ -105,7 +105,7 @@
      info
    } = this.data
    wx.previewImage({
      urls: info.imageurlList,
      urls: info.spaceList.map(i => i.spaceImg),
      current: url
    })
  },

 wechat_staff/pages/detailDis/product.less

@@ -163,6 +163,7 @@
    position: relative;
    .img{
      width: 100%;
      height: 376rpx;
    }
    .play{
      position: absolute;
@@ -177,6 +178,14 @@
      border-radius: 30rpx;
      font-size: 26rpx;
      color: rgba(255,255,255,0.8);
      display: flex;
      align-items: center;
      justify-content: center;
      .icon{
        width: 14rpx;
        height: 16rpx;
        margin-left: 14rpx;
      }
    }
  }
}
@@ -193,13 +202,12 @@

  .line {
    display: flex;
    height: 32rpx;
    margin-bottom: 24rpx;

    margin-bottom: 20rpx;
    .label {
      width: auto;
      font-size: 24rpx;
      color: #666666;
      flex-shrink: 0;
    }

    .val {

 wechat_staff/pages/detailDis/product.wxml

@@ -21,8 +21,11 @@
  <view wx:if="{{ info.video }}" class="video">
    <view class="title">产品视频</view>
    <view class="img_wrap">
      <image class="img" src="{{ info.coverImage }}" mode="widthFix"></image>
      <view bindtap="playVideo" class="play">播放</view>
      <image class="img" src="{{ info.coverImage }}" mode="aspectFill"></image>
      <view  class="play">
        <view>播放</view>
        <image bindtap="playVideo" src="../../static/icon/ic_play.png" class="icon"></image>
      </view>
    </view>
  </view>
  <view class="detail">

 wechat_staff/pages/detailDis/product.wxss

@@ -143,6 +143,7 @@
}
.video .img_wrap .img {
  width: 100%;
  height: 376rpx;
}
.video .img_wrap .play {
  position: absolute;
@@ -157,6 +158,14 @@
  border-radius: 30rpx;
  font-size: 26rpx;
  color: rgba(255, 255, 255, 0.8);
  display: flex;
  align-items: center;
  justify-content: center;
}
.video .img_wrap .play .icon {
  width: 14rpx;
  height: 16rpx;
  margin-left: 14rpx;
}
.detail {
  padding: 52rpx 40rpx 40rpx;
@@ -169,13 +178,13 @@
}
.detail .line {
  display: flex;
  height: 32rpx;
  margin-bottom: 24rpx;
  margin-bottom: 20rpx;
}
.detail .line .label {
  width: auto;
  font-size: 24rpx;
  color: #666666;
  flex-shrink: 0;
}
.detail .line .val {
  flex: 1;

 wechat_staff/pages/kefu/fond.js

@@ -131,7 +131,7 @@
    console.log('obj', obj);
    let that = this
    getContentShareImg({
      articleId: obj.id + '&' + obj.joinType,
      articleId: obj.id + '_' + obj.joinType,
      type: '0',
      // pageUrl: path,
      imgurl: obj.coverImage,