liukangdong
2024-08-05 00bf17838b496e6fcfed2e521f9c27f8f0e3e3c7
‘’
已修改34个文件
205 ■■■■■ 文件已修改
wechat_jiaxuan/components/disCase/index.less 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_jiaxuan/components/disCase/index.wxss 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_jiaxuan/components/disProduct/index.less 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_jiaxuan/components/disProduct/index.wxss 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_jiaxuan/components/disRealpic/index.less 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_jiaxuan/components/disRealpic/index.wxss 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_jiaxuan/pages/consult/consult.less 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_jiaxuan/pages/consult/consult.wxss 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_jiaxuan/pages/consult/detail.js 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_jiaxuan/pages/consult/detail.json 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_jiaxuan/pages/index/index.js 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_jiaxuan/pages/index/index.wxml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_jiaxuan/pages/kefu/index.js 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_jiaxuan/pages/productVideo/index.js 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_jiaxuan/pages/productVideo/index.less 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_jiaxuan/pages/productVideo/index.wxml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_jiaxuan/pages/productVideo/index.wxss 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_jiaxuan/utils/config.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_staff/components/disCase/index.less 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_staff/components/disCase/index.wxss 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_staff/components/disProduct/index.less 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_staff/components/disProduct/index.wxss 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_staff/components/disRealpic/index.less 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_staff/components/disRealpic/index.wxss 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_staff/pages/consult/consult.less 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_staff/pages/consult/consult.wxss 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_staff/pages/index/index.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_staff/pages/index/index.wxml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_staff/pages/kefu/index.js 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_staff/pages/productVideo/index.js 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_staff/pages/productVideo/index.less 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_staff/pages/productVideo/index.wxml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_staff/pages/productVideo/index.wxss 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_staff/project.private.config.json 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
wechat_jiaxuan/components/disCase/index.less
@@ -125,9 +125,10 @@
    }
  }
  .goods_list{
    height: calc( 100% -  222rpx);
    width: 590rpx;
    box-sizing: border-box;
    padding: 12rpx 40rpx;
    height: calc( 100% - 188rpx);
    .empty{
      height: 100rpx;
    }
wechat_jiaxuan/components/disCase/index.wxss
@@ -123,9 +123,10 @@
  background-color: #333333;
}
.main_content .goods_list {
  height: calc(100% - 222rpx);
  width: 590rpx;
  box-sizing: border-box;
  padding: 12rpx 40rpx;
  height: calc(100% - 188rpx);
}
.main_content .goods_list .empty {
  height: 100rpx;
wechat_jiaxuan/components/disProduct/index.less
@@ -166,7 +166,7 @@
      }
    }
    .goods_list {
      height: calc( 100% -  182rpx);
      height: calc( 100% -  222rpx);
      width: 590rpx;
      box-sizing: border-box;
      padding: 12rpx 40rpx;
wechat_jiaxuan/components/disProduct/index.wxss
@@ -153,7 +153,7 @@
  background-color: #333333;
}
.main_content .main_right .goods_list {
  height: calc(100% - 182rpx);
  height: calc(100% - 222rpx);
  width: 590rpx;
  box-sizing: border-box;
  padding: 12rpx 40rpx;
wechat_jiaxuan/components/disRealpic/index.less
@@ -136,9 +136,10 @@
  }
  .goods_list {
    padding: 12rpx 40rpx;
    height: calc( 100% - 188rpx);
    height: calc( 100% -  222rpx);
    width: 590rpx;
    box-sizing: border-box;
    padding: 12rpx 40rpx;
    .empty{
      height: 100rpx;
    }
wechat_jiaxuan/components/disRealpic/index.wxss
@@ -123,9 +123,10 @@
  background-color: #333333;
}
.main_content .goods_list {
  padding: 12rpx 40rpx;
  height: calc(100% - 188rpx);
  height: calc(100% - 222rpx);
  width: 590rpx;
  box-sizing: border-box;
  padding: 12rpx 40rpx;
}
.main_content .goods_list .empty {
  height: 100rpx;
wechat_jiaxuan/pages/consult/consult.less
@@ -61,21 +61,21 @@
  align-items: center;
  margin-left: 0;
  .item {
    padding: 0 40rpx;
    padding: 0 20rpx;
    display: flex;
    align-items: center;
    font-size: 24rpx;
    font-size: 26rpx;
    color: #333333;
    height: 60rpx;
    height: 68rpx;
    margin-right: 24rpx;
    line-height: 68rpx;
    background: #F7F7F7;
    border-radius: 8rpx;
    margin-right: 24rpx;
  }
  .active{
    color: var(--themeColor);
    background: rgba(176, 135, 113, 0.08);
    font-size: 24rpx;
    font-weight: 400;
    color: #B08771;
  }
}
.content{
wechat_jiaxuan/pages/consult/consult.wxss
@@ -58,21 +58,20 @@
  margin-left: 0;
}
.second_list .item {
  padding: 0 40rpx;
  padding: 0 20rpx;
  display: flex;
  align-items: center;
  font-size: 24rpx;
  font-size: 26rpx;
  color: #333333;
  height: 60rpx;
  height: 68rpx;
  line-height: 68rpx;
  background: #F7F7F7;
  border-radius: 8rpx;
  margin-right: 24rpx;
}
.second_list .active {
  color: var(--themeColor);
  background: rgba(176, 135, 113, 0.08);
  font-size: 24rpx;
  font-weight: 400;
  color: #B08771;
}
.content {
  padding: 0rpx 40rpx 40rpx;
wechat_jiaxuan/pages/consult/detail.js
@@ -1,4 +1,4 @@
import { actionDo, getProductNewsInfo } from '../../api/index'
import { actionDo, getProductNewsInfo, getMemberInfo } from '../../api/index'
Page({
  /**
@@ -16,6 +16,9 @@
  /**
   * 生命周期函数--监听页面加载
   */
  onLoadLogin(options) {
    this.getDetail(options.id, options.userId || '')
  },
  onLoad(options) {
    var app = getApp().globalData
    this.setData({
@@ -24,7 +27,7 @@
    if(options.origin && options.origin == 'b'){
      this.setData({ origin: 'b' })
    }
    this.getDetail(options.id, options.userId || '')
    // this.getDetail(options.id, options.userId || '')
  },
  handleDesign() {
    wx.navigateTo({
@@ -44,6 +47,14 @@
      wx.setNavigationBarTitle({
        title: res.data.title
      })
      if (userId) {
        getMemberInfo().then(res => {
          this.setData({
            member: res.data
          })
          wx.setStorageSync('member', res.data)
        })
      }
    })
  },
  openShare() {
wechat_jiaxuan/pages/consult/detail.json
@@ -1,6 +1,7 @@
{
  "usingComponents": {
    "van-popup": "@vant/weapp/popup/index",
    "idCard": "../../components/idCard/index",
    "mp-html": "mp-html"
  },
  "navigationBarTitleText": ""
wechat_jiaxuan/pages/index/index.js
@@ -402,11 +402,12 @@
  },
  onPageScroll(e) {
    const { videoTop, windowHeight, videoPlay } = this.data
    if(e.scrollTop - 100 > videoTop - (windowHeight / 2) && videoPlay ){
    if(e.scrollTop + 100 > videoTop - (windowHeight / 2) && videoPlay ){
      this.setData({ videoPlay: false })
      let videoplay = wx.createVideoContext('myvideo', this)
      videoplay.play();
    }
    let scrollTop = e.scrollTop / 100
    if (scrollTop <= 0.1) {
      this.setData({
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" src="{{ productVideo[0].videoUrl }}" show-fullscreen-btn></video>
    <video poster="{{ productVideo[0].coverImage }}" bindplay="bindVideoPlay" id="myvideo" 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/kefu/index.js
@@ -12,14 +12,14 @@
  /**
   * 生命周期函数--监听页面加载
   */
  onLoadLogin(options) {
    this.getDetail(options.id)
  },
  onLoad(options) {
    var app = getApp().globalData
    this.setData({
      bottomLift: app.bottomLift
    })
    if(options && options.id){
      this.getDetail(options.id)
    }
  },
  toSever () {
    console.log('客服');
wechat_jiaxuan/pages/productVideo/index.js
@@ -5,6 +5,9 @@
   * 页面的初始数据
   */
  data: {
    acVid: '',
    viewIdList: [],
    videoContext:null,
    category: [],
    tagCodes: '',
@@ -51,25 +54,30 @@
  },
  itemClick(e) {
    const { id} = e.currentTarget.dataset.item
    const { dataList } = this.data
    dataList.forEach(ite => {
      if(id === ite.id){
        ite.viewCount += 1
    const { dataList, acVid, viewIdList } = this.data
    const index = viewIdList.findIndex(i => i === id)
    if(acVid){
      if(id != acVid){
        wx.createVideoContext(acVid).pause()
        wx.createVideoContext(id).play()
        this.setData({ acVid: id })
      }
    })
    this.setData({ dataList })
    }else{
      this.setData({ acVid: id })
      wx.createVideoContext(id).play()
    }
    dataList.forEach(ite => {
      if(id === ite.id && index === -1){
        ite.viewCount += 1
        viewIdList.push(id)
    actionDo({
      actionType: 'view',
      id: id
    })
    // let videoPlay = this.selectComponent('.videoPlay');
    // if(videoPlay){
    //   videoPlay.startPlayVideo(videourl,this );
    // }
    // this.startPlayVideo(videourl)
    // wx.previewMedia({
    //   sources: [{ url: videourl, type: 'video' }]
    // })
        this.setData({ viewIdList })
      }
    })
    this.setData({ dataList })
  },
  cateClick(e) {
    const { code } = e.target.dataset
wechat_jiaxuan/pages/productVideo/index.less
@@ -58,6 +58,9 @@
  .item{
    margin-bottom: 60rpx;
    position: relative;
    video{
      border-radius: 8rpx;
    }
    .play{
      width: 60rpx;
      position: absolute;
wechat_jiaxuan/pages/productVideo/index.wxml
@@ -19,7 +19,7 @@
        <image class="img" src="{{ item.coverImage }}" mode="aspectFill"></image>
        <image class="play" src="../../static/icon/ic_play.png" mode="widthFix"></image>
      </view> -->
      <video 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">
wechat_jiaxuan/pages/productVideo/index.wxss
@@ -56,6 +56,9 @@
  margin-bottom: 60rpx;
  position: relative;
}
.content .item video {
  border-radius: 8rpx;
}
.content .item .play {
  width: 60rpx;
  position: absolute;
wechat_jiaxuan/utils/config.js
@@ -1,10 +1,10 @@
export const baseUrl = 'http://192.168.0.135:10027' // 本地
// export const baseUrl = 'http://192.168.0.135:10027' // 本地
// export const baseUrl = 'https://dmtest.ahapp.net/web_interface' //测试服务器
// export const baseUrl = 'https://dmdev.zhibang.com:8443/web_interface'
export const baseUrl = 'https://dmdev.zhibang.com:8443/web_interface'
// 腾讯地图开发者 key
export const qqMapKey = 'HIDBZ-2QXL4-TAWUD-XET6Q-EKTJE-CCBSQ'
wechat_staff/components/disCase/index.less
@@ -125,9 +125,10 @@
    }
  }
  .goods_list{
    height: calc( 100% -  222rpx);
    width: 590rpx;
    box-sizing: border-box;
    padding: 12rpx 40rpx;
    height: calc( 100% - 188rpx);
    .empty{
      height: 100rpx;
    }
wechat_staff/components/disCase/index.wxss
@@ -123,9 +123,10 @@
  background-color: #333333;
}
.main_content .goods_list {
  height: calc(100% - 222rpx);
  width: 590rpx;
  box-sizing: border-box;
  padding: 12rpx 40rpx;
  height: calc(100% - 188rpx);
}
.main_content .goods_list .empty {
  height: 100rpx;
wechat_staff/components/disProduct/index.less
@@ -167,7 +167,7 @@
    }
    .goods_list {
      height: calc( 100% -  182rpx);
      height: calc( 100% -  222rpx);
      width: 590rpx;
      box-sizing: border-box;
      padding: 12rpx 40rpx;
wechat_staff/components/disProduct/index.wxss
@@ -151,7 +151,7 @@
  background-color: #333333;
}
.main_content .main_right .goods_list {
  height: calc(100% - 182rpx);
  height: calc(100% - 222rpx);
  width: 590rpx;
  box-sizing: border-box;
  padding: 12rpx 40rpx;
wechat_staff/components/disRealpic/index.less
@@ -137,9 +137,10 @@
  }
  .goods_list {
    padding: 12rpx 40rpx;
    height: calc( 100% - 188rpx);
    height: calc( 100% -  222rpx);
    width: 590rpx;
    box-sizing: border-box;
    padding: 12rpx 40rpx;
    .empty{
      height: 100rpx;
    }
wechat_staff/components/disRealpic/index.wxss
@@ -123,9 +123,10 @@
  background-color: #333333;
}
.main_content .goods_list {
  padding: 12rpx 40rpx;
  height: calc(100% - 188rpx);
  height: calc(100% - 222rpx);
  width: 590rpx;
  box-sizing: border-box;
  padding: 12rpx 40rpx;
}
.main_content .goods_list .empty {
  height: 100rpx;
wechat_staff/pages/consult/consult.less
@@ -51,7 +51,7 @@
  .active {
    color: #222222;
    font-weight: 500;
    font-weight: 600;
    font-size: 30rpx;
  }
}
@@ -61,12 +61,14 @@
  align-items: center;
  margin-left: 0;
  .item {
    padding: 0 40rpx;
    padding: 0 20rpx;
    display: flex;
    align-items: center;
    font-size: 24rpx;
    font-size: 26rpx;
    color: #333333;
    height: 60rpx;
    height: 68rpx;
    margin-right: 24rpx;
    line-height: 68rpx;
    background: #F7F7F7;
    border-radius: 8rpx;
    margin-right: 24rpx;
@@ -74,7 +76,7 @@
  .active{
    color: var(--themeColor);
    background: rgba(176, 135, 113, 0.08);
    font-size: 24rpx;
    font-size: 26rpx;
    font-weight: 400;
  }
}
wechat_staff/pages/consult/consult.wxss
@@ -49,7 +49,7 @@
}
.scroll_cate .active {
  color: #222222;
  font-weight: 500;
  font-weight: 600;
  font-size: 30rpx;
}
.second_list {
@@ -58,12 +58,13 @@
  margin-left: 0;
}
.second_list .item {
  padding: 0 40rpx;
  padding: 0 20rpx;
  display: flex;
  align-items: center;
  font-size: 24rpx;
  font-size: 26rpx;
  color: #333333;
  height: 60rpx;
  height: 68rpx;
  line-height: 68rpx;
  background: #F7F7F7;
  border-radius: 8rpx;
  margin-right: 24rpx;
@@ -71,7 +72,7 @@
.second_list .active {
  color: var(--themeColor);
  background: rgba(176, 135, 113, 0.08);
  font-size: 24rpx;
  font-size: 26rpx;
  font-weight: 400;
}
.content {
wechat_staff/pages/index/index.js
@@ -129,7 +129,7 @@
  },
  onPageScroll(e) {
    const { videoTop, windowHeight, videoPlay } = this.data
    if(e.scrollTop > videoTop - (windowHeight / 2) && videoPlay ){
    if(e.scrollTop + 60 > videoTop - (windowHeight / 2) && videoPlay ){
      this.setData({ videoPlay: false })
      let videoplay = wx.createVideoContext('myvideo', this)
      videoplay.play();
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 bindplay="bindVideoPlay" id="myvideo" src="{{ productVideo[0].videoUrl }}" show-fullscreen-btn></video>
    <video 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>
wechat_staff/pages/kefu/index.js
@@ -22,9 +22,10 @@
    }
  },
  handleShare() {
    const { info } = this.data
    wx.navigateToMiniProgram({
      appId: 'wxcd2b89fd2ff065f8',
      path: `/pages/kefu/index`,
      path: `/pages/kefu/index?title=专属客服&id=${info.id}`,
      envVersion: 'trial'
    })
  },
wechat_staff/pages/productVideo/index.js
@@ -7,6 +7,8 @@
  data: {
    category: [],
    tagCodes: '',
    acVid:'',
    viewIdList: [],
    dataList: [],
    total: 0,
@@ -47,17 +49,30 @@
  },
  itemClick(e) {
    const { id } = e.currentTarget.dataset.item
    const { dataList } = this.data
    dataList.forEach(ite => {
      if(id === ite.id){
        ite.viewCount += 1
    const { dataList, acVid, viewIdList } = this.data
    const index = viewIdList.findIndex(i => i === id)
    if(acVid){
      if(id != acVid){
        wx.createVideoContext(acVid).pause()
        wx.createVideoContext(id).play()
        this.setData({ acVid: id })
      }
    })
    this.setData({ dataList })
    }else{
      this.setData({ acVid: id })
      wx.createVideoContext(id).play()
    }
    dataList.forEach(ite => {
      if(id === ite.id && index === -1){
        ite.viewCount += 1
        viewIdList.push(id)
    actionDo({
      actionType: 'view',
      id: id
    })
        this.setData({ viewIdList })
      }
    })
    this.setData({ dataList })
  },
  cateClick(e) {
    const { code } = e.target.dataset
wechat_staff/pages/productVideo/index.less
@@ -78,6 +78,9 @@
      color: #111111;
      margin: 24rpx 0 12rpx;
    }
    video{
      border-radius: 8rpx;
    }
    .static{
      font-size: 24rpx;
      color: #999999;
wechat_staff/pages/productVideo/index.wxml
@@ -20,7 +20,7 @@
        <image class="img" src="{{ item.coverImage }}" mode="widthFix"></image>
        <image class="play" src="../../static/icon/ic_play.png" mode="widthFix"></image>
      </view> -->
      <video 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">
wechat_staff/pages/productVideo/index.wxss
@@ -76,6 +76,9 @@
  color: #111111;
  margin: 24rpx 0 12rpx;
}
.content .item video {
  border-radius: 8rpx;
}
.content .item .static {
  font-size: 24rpx;
  color: #999999;
wechat_staff/project.private.config.json
@@ -31,7 +31,7 @@
        },
        {
          "name": "",
          "pathName": "pages/detailDis/product",
          "pathName": "pages/productVideo/index",
          "query": "id=1813372914895843329",
          "launchMode": "default",
          "scene": null