''
liukangdong
2024-08-06 7b950f425d01b74febcebb9a6506e1607c3a2a0f
''
已修改19个文件
129 ■■■■■ 文件已修改
wechat_jiaxuan/components/disCase/index.less 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_jiaxuan/components/disCase/index.wxss 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_jiaxuan/components/disRealpic/index.less 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_jiaxuan/components/disRealpic/index.wxss 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_jiaxuan/pages/auth/auth.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_jiaxuan/pages/consult/detail.js 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_jiaxuan/pages/detailDis/case.js 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_jiaxuan/pages/detailDis/product.js 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_jiaxuan/pages/detailDis/realpic.js 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_jiaxuan/pages/index/index.js 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_jiaxuan/pages/index/index.wxml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_jiaxuan/pages/productVideo/index.js 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_jiaxuan/pages/productVideo/index.wxml 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_jiaxuan/project.private.config.json 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_staff/components/disCase/index.less 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_staff/components/disCase/index.wxss 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_staff/components/disRealpic/index.less 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_staff/components/disRealpic/index.wxss 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_staff/pages/index/index.wxml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_jiaxuan/components/disCase/index.less
@@ -126,7 +126,7 @@
  }
  .goods_list{
    height: calc( 100% -  222rpx);
    width: 590rpx;
    width: 100%;
    box-sizing: border-box;
    padding: 12rpx 40rpx;
    .empty{
wechat_jiaxuan/components/disCase/index.wxss
@@ -124,7 +124,7 @@
}
.main_content .goods_list {
  height: calc(100% - 222rpx);
  width: 590rpx;
  width: 100%;
  box-sizing: border-box;
  padding: 12rpx 40rpx;
}
wechat_jiaxuan/components/disRealpic/index.less
@@ -137,16 +137,19 @@
  .goods_list {
    height: calc( 100% -  222rpx);
    width: 590rpx;
    width: 750rpx;
    box-sizing: border-box;
    padding: 12rpx 40rpx;
    display: flex;
    .empty{
      width: 100%;
      height: 100rpx;
    }
    .item {
      width: 324rpx;
      float: left;
      margin-bottom: 32rpx; 
      margin-right: 0;
      &:nth-of-type(2n){
        margin-right: 22rpx;
      }
wechat_jiaxuan/components/disRealpic/index.wxss
@@ -124,17 +124,20 @@
}
.main_content .goods_list {
  height: calc(100% - 222rpx);
  width: 590rpx;
  width: 750rpx;
  box-sizing: border-box;
  padding: 12rpx 40rpx;
  display: flex;
}
.main_content .goods_list .empty {
  width: 100%;
  height: 100rpx;
}
.main_content .goods_list .item {
  width: 324rpx;
  float: left;
  margin-bottom: 32rpx;
  margin-right: 0;
}
.main_content .goods_list .item:nth-of-type(2n) {
  margin-right: 22rpx;
wechat_jiaxuan/pages/auth/auth.js
@@ -78,6 +78,7 @@
            const tempPath = wx.getStorageSync('tempPath') || ''
            wx.setStorageSync('member', res.data)
            if (tempPath) {
              wx.setStorageSync('tempPath', '')
              wx.redirectTo({
                url: tempPath,
              })
wechat_jiaxuan/pages/consult/detail.js
@@ -30,6 +30,12 @@
    // this.getDetail(options.id, options.userId || '')
  },
  handleDesign() {
    const { member } = this.data
    if (!member.phone) {
      return wx.navigateTo({
        url: '/pages/auth/auth',
      })
    }
    wx.navigateTo({
      url: '/pages/design/design',
    })
wechat_jiaxuan/pages/detailDis/case.js
@@ -89,7 +89,7 @@
      info
    } = this.data
    const member = wx.getStorageSync('member')
    if (member.authStatus == '0') {
    if (!member.phone) {
      return wx.navigateTo({
        url: '/pages/auth/auth',
      })
@@ -146,6 +146,12 @@
    })
  },
  handleDesign() {
    const { member } = this.data
    if (!member.phone) {
      return wx.navigateTo({
        url: '/pages/auth/auth',
      })
    }
    wx.navigateTo({
      url: '/pages/design/design',
    })
wechat_jiaxuan/pages/detailDis/product.js
@@ -77,7 +77,7 @@
    const {
      info, member
    } = this.data
    if (member.authStatus == '0') {
    if (!member.phone) {
      return wx.navigateTo({
        url: '/pages/auth/auth',
      })
@@ -136,6 +136,12 @@
    })
  },
  handleDesign() {
    const { member } = this.data
    if (!member.phone) {
      return wx.navigateTo({
        url: '/pages/auth/auth',
      })
    }
    wx.navigateTo({
      url: '/pages/design/design',
    })
wechat_jiaxuan/pages/detailDis/realpic.js
@@ -51,7 +51,7 @@
      info
    } = this.data
    const member = wx.getStorageSync('member')
    if (member.authStatus == '0') {
    if (!member.phone) {
      return wx.navigateTo({
        url: '/pages/auth/auth',
      })
@@ -120,6 +120,12 @@
    })
  },
  handleDesign() {
    const { member } = this.data
    if (!member.phone) {
      return wx.navigateTo({
        url: '/pages/auth/auth',
      })
    }
    wx.navigateTo({
      url: '/pages/design/design',
    })
wechat_jiaxuan/pages/index/index.js
@@ -91,7 +91,7 @@
  onLoad(options) {
    console.log(options)
    this.initDictData()
    this.initData()
    // this.initData()
  },
  changePath(e) {
    let index = e.currentTarget.dataset.type
@@ -156,16 +156,16 @@
  initData() {
    // 轮播
    getHomeBanner().then(res => {
      this.setData({
        bannerList: res.data
      })
      if(res.data){
        this.setData({ bannerList: res.data })
      }
    })
    // 产品视频
    getZhongTaiVideoPage({
      pageSize: 1,
      pageNum: 1
    }).then(res => {
      if (res.data.records && res.data.records.length > 0) {
      if (res.data && res.data.records && res.data.records.length > 0) {
        this.setData({
          productVideo: res.data.records
        })
@@ -182,7 +182,7 @@
      pageSize: 6,
      pageNum: 1
    }).then(res => {
      if (res.data) {
      if (res.data && res.data.records) {
        this.setData({
          consultList: res.data.records
        })
wechat_jiaxuan/pages/index/index.wxml
@@ -59,7 +59,7 @@
      </view>
      <image class="ar_right" src="../../static/icon/home_ar@2x.png"></image>
    </view>
    <video poster="{{ productVideo[0].coverImage }}" bindplay="bindVideoPlay" id="myvideo" muted src="{{ productVideo[0].videoUrl }}" show-fullscreen-btn></video>
    <video poster="{{ productVideo[0].coverImage }}" bindplay="bindVideoPlay" id="myvideo" show-mute-btn muted src="{{ productVideo[0].videoUrl }}" show-fullscreen-btn></video>
    <!-- <view  bindtap="videoClick" data-id="{{ productVideo[0].id }}" data-videourl="{{ productVideo[0].videoUrl }}" class="video_wrap">
      <image class="img" src="{{ productVideo[0].coverImage }}" mode="aspectFill"></image>
      <image class="play" src="../../static/icon/ic_play.png"></image>
wechat_jiaxuan/pages/productVideo/index.js
@@ -7,10 +7,12 @@
  data: {
    acVid: '',
    viewIdList: [],
    activeIndex: -1,
    activeParam: [],
    tagCodes: [],
    videoContext:null,
    category: [],
    tagCodes: '',
    videoUrl: '',
    showVideo: false,
    isShow:false,
@@ -37,7 +39,7 @@
  getList() {
    const { pageSize, pageNum, tagCodes } = this.data
    getZhongTaiVideoPage({
      pageSize,pageNum, tagCodes: tagCodes ? [tagCodes] : null
      pageSize,pageNum, tagCodes
    }).then(res => {
      this.setData({
        dataList: [...this.data.dataList, ...res.data.records],
@@ -80,8 +82,8 @@
    this.setData({ dataList })
  },
  cateClick(e) {
    const { code } = e.target.dataset
    this.setData({ tagCodes: code })
    const { code, index } = e.target.dataset
    this.setData({ tagCodes: [code], activeIndex: index })
    this.setData({ total: 0, dataList: [], pageNum: 1 })
    this.getList()
  },
wechat_jiaxuan/pages/productVideo/index.wxml
@@ -1,25 +1,36 @@
<view class="container"  >
<view class="container">
  <!-- 分类 -->
  <view>
    <scroll-view wx:if="{{ category.length > 0 }}" scroll-x="true" style="width: 710rpx;margin-bottom: 30rpx;" >
    <scroll-view wx:if="{{ category.length > 0 && category.length == 1 }}" scroll-x="true" style="width: 710rpx;margin-bottom: 30rpx;">
      <view class="scroll_cate">
        <view bindtap="cateClick" data-code="{{item.labelCode}}" wx:for="{{ category }}" class="item {{ tagCodes == item.labelCode ? 'active': '' }}">{{ item.labelName }}</view>
        <view bindtap="cateClick" data-index="{{index}}" data-code="{{item.labelValueCode}}" wx:for="{{ category[0].valueVos }}" class="item {{ activeIndex == index ? 'active': '' }}">{{ item.labelValueName }}</view>
      </view>
    </scroll-view>
    <!-- <scroll-view scroll-x="true" style="weight: 710rpx;margin-bottom: 28rpx;">
      <view class="scroll_cate second_list">
        <view bindtap="seCateClick" data-index="{{index}}" wx:for="{{ secondCategory }}" class="item {{ index == 0 ? 'active': '' }}">{{ index }}{{ item }}</view>
    <block wx:if="{{ category.length > 1 }}">
      <scroll-view class="query_wrap_scroll" scroll-x>
        <view class="query_wrap">
          <view data-index="{{index}}" wx:for="{{ secondCateList }}" class="item" bindtap="changeShowParams">
            <view class="name">{{ item.tempParamName || item.labelName }}</view>
            <van-icon name="{{ index == activeIndex ? 'arrow-up' : 'arrow-down' }}" />
          </view>
        </view>
      </scroll-view>
      <view wx:if="{{ activeParam.length > 0 }}" class="query_form">
        <view class="list">
          <view data-index="{{index}}" data-tempindex="{{item.tempParamIndex}}" data-code="{{ item.labelValueCode }}" bindtap="tagClick" wx:for="{{ activeParam }}" class="item {{ secondCateList[activeIndex].tempParamIndex === index ? 'active' : '' }}">{{ item.labelValueName }}</view>
        </view>
        <view class="btns">
          <view class="btn" bindtap="cancelParam">取消</view>
          <view class="btn sub" bindtap="subParam">确认</view>
        </view>
      </view>
    </scroll-view> -->
      <view wx:if="{{ activeParam.length > 0 }}" class="shade"></view>
    </block>
  </view>
  <!-- content -->
  <view class="content" >
  <view class="content">
    <view wx:for="{{ dataList }}" class="item">
      <!-- <view bindtap="itemClick" data-videourl="{{ item.videoUrl }}"  data-id="{{ item.id }}" class="img_wrap">
        <image class="img" src="{{ item.coverImage }}" mode="aspectFill"></image>
        <image class="play" src="../../static/icon/ic_play.png" mode="widthFix"></image>
      </view> -->
      <video id="{{item.id}}" poster="{{ item.coverImage }}" data-item="{{ item }}" bindplay="itemClick" class="img_wrap" src="{{ item.videoUrl }}"    show-center-play-btn show-fullscreen-btn></video>
      <video id="{{item.id}}" poster="{{ item.coverImage }}" data-item="{{ item }}" bindplay="itemClick" class="img_wrap" src="{{ item.videoUrl }}" show-center-play-btn show-fullscreen-btn></video>
      <view class="title">{{ item.title }}</view>
      <view class="df_sb static">
@@ -33,12 +44,7 @@
    <view wx:if="{{ dataList.length == 0 }}" class="empty_wrap">
      <image class="default_empty" src="../../static/images/default_empty.png"></image>
    </view>
  </view>
  <!-- <view wx:if="{{ isShow }}" bind:tap="onClose" class="video_content">
      <view  class="video">
      <video    id="myVideo" src="{{curVideoSrc}}"  autoplay   show-fullscreen-btn show-play-btn ></video>
      </view>
  </view > -->
  <videoPlay class='videoPlay' />
  </view>
  <videoPlay class='videoPlay' />
</view>
<wxs module="math" src="../../utils/math.wxs"></wxs>
wechat_jiaxuan/project.private.config.json
@@ -53,7 +53,7 @@
        },
        {
          "name": "",
          "pathName": "pages/detailDis/product",
          "pathName": "pages/productVideo/index",
          "query": "",
          "launchMode": "default",
          "scene": null
wechat_staff/components/disCase/index.less
@@ -126,7 +126,7 @@
  }
  .goods_list{
    height: calc( 100% -  222rpx);
    width: 590rpx;
    width: 750rpx;
    box-sizing: border-box;
    padding: 12rpx 40rpx;
    .empty{
wechat_staff/components/disCase/index.wxss
@@ -124,7 +124,7 @@
}
.main_content .goods_list {
  height: calc(100% - 222rpx);
  width: 590rpx;
  width: 750rpx;
  box-sizing: border-box;
  padding: 12rpx 40rpx;
}
wechat_staff/components/disRealpic/index.less
@@ -138,7 +138,7 @@
  .goods_list {
    height: calc( 100% -  222rpx);
    width: 590rpx;
    width: 750rpx;
    box-sizing: border-box;
    padding: 12rpx 40rpx;
    .empty{
wechat_staff/components/disRealpic/index.wxss
@@ -124,7 +124,7 @@
}
.main_content .goods_list {
  height: calc(100% - 222rpx);
  width: 590rpx;
  width: 750rpx;
  box-sizing: border-box;
  padding: 12rpx 40rpx;
}
wechat_staff/pages/index/index.wxml
@@ -62,7 +62,7 @@
      </view>
      <image class="ar_right" src="../../static/icon/home_ar@2x.png"></image>
    </view>
    <video muted bindplay="bindVideoPlay" id="myvideo" src="{{ productVideo[0].videoUrl }}" show-fullscreen-btn></video>
    <video show-mute-btn muted bindplay="bindVideoPlay" id="myvideo" src="{{ productVideo[0].videoUrl }}" show-fullscreen-btn></video>
    <!-- <view bindtap="videoClick" data-videourl="{{ productVideo[0].videoUrl }}" class="video_wrap">
      <image class="img" src="{{ productVideo[0].coverImage }}" mode="aspectFill"></image>
      <image class="play" src="../../static/icon/ic_play.png" mode="widthFix"></image>