Merge remote-tracking branch 'origin/master'

jiangping

2024-07-25 4d064bfdbce064688ddb7252ff6c52b041a279dd

Merge remote-tracking branch 'origin/master'

 wechat_jiaxuan/components/idCard/index.js

@@ -18,6 +18,15 @@
   * 组件的方法列表
   */
  methods: {

    callPhone() {
      wx.makePhoneCall({
        phoneNumber: this.data.users.phone
      })
    },
    jumpCard() {
      wx.navigateTo({
        url: '/pages/store/staff?id=' + this.data.users.iamId,
      })
    },
  }
})

 wechat_jiaxuan/components/idCard/index.less

@@ -36,7 +36,10 @@
      align-items: center;
      justify-content: center;
      margin-left: 70rpx;
      font-size: 20rpx;
      color: #333333;
      .icon{
        margin-bottom: 4rpx;
        width: 44rpx;
        height: 44rpx;
      }

 wechat_jiaxuan/components/idCard/index.wxml

@@ -5,13 +5,13 @@
      <view class="desc">导购｜{{ users.jobDate || 1 }}年经验</view>
    </view>
    <view class="btns">
      <view class="item">
        <image class="icon" src="../../static/icon/mingpian_bg_nianxian@2x.png"></image>
      <view bindtap="jumpCard" class="item">
        <image class="icon" src="../../static/icon/ic_mingpian.png"></image>
        <text>名片</text>
      </view>
      <view class="item">
        <image class="icon" src="../../static/icon/mingpian_bg_nianxian@2x.png"></image>
        <text>名片</text>
      <view bindtap="callPhone" class="item">
        <image class="icon" src="../../static/icon/ic_dianhua.png"></image>
        <text>打电话</text>
      </view>
    </view>
  </view>

 wechat_jiaxuan/components/idCard/index.wxss

@@ -34,8 +34,11 @@
  align-items: center;
  justify-content: center;
  margin-left: 70rpx;
  font-size: 20rpx;
  color: #333333;
}
.user .btns .item .icon {
  margin-bottom: 4rpx;
  width: 44rpx;
  height: 44rpx;
}

 wechat_jiaxuan/pages/consult/consult.json

@@ -1,3 +1,6 @@
{
  "usingComponents": {
    "idCard": "../../components/idCard/index"
  },
  "navigationBarTitleText": "资讯"
}

 wechat_jiaxuan/pages/consult/detail.js

@@ -20,15 +20,15 @@
    this.setData({
      bottomLift: app.bottomLift
    })
    this.getDetail(options.id)
    this.getDetail(options.id, options.userId || '')
  },
  handleDesign() {
    wx.navigateTo({
      url: '/pages/design/design',
    })
  },
  getDetail(id) {
    getProductNewsInfo({ id }).then(res => {
  getDetail(id, userId) {
    getProductNewsInfo({ id, salesId: userId || null }).then(res => {
      this.setData({ info: res.data })
      wx.setNavigationBarTitle({
        title: res.data.title

 wechat_jiaxuan/pages/consult/detail.wxml

@@ -1,5 +1,6 @@
<view>
  <!-- <navBar title="{{ navTitle }}"></navBar> -->
    <!-- 名片 -->
    <idCard users="{{ info.users }}" wx:if="{{ 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/detailDis/case.js

@@ -17,7 +17,7 @@
    this.setData({
      bottomLift: app.bottomLift
    })
    this.getDetail(options.id)
    this.getDetail(options.id, options.userId || '')
    actionDo({
      actionType: 'view',
      id: options.id
@@ -63,8 +63,8 @@
      })
    })
  },
  getDetail(id) {
    getWholecaseInfo({id}).then(res => {
  getDetail(id, userId) {
    getWholecaseInfo({id, salesId: userId || null}).then(res => {
      this.setData({ info: res.data })
      wx.setNavigationBarTitle({
        title: res.data.title

 wechat_jiaxuan/pages/detailDis/case.json

@@ -1,6 +1,7 @@
{
  "usingComponents": {
    "van-popup": "@vant/weapp/popup/index",
    "idCard": "../../components/idCard/index",
    "mp-html": "mp-html"
  },
  "navigationBarTitleText": ""

 wechat_jiaxuan/pages/detailDis/case.wxml

@@ -1,4 +1,6 @@
<view class="container">
  <!-- 名片 -->
  <idCard users="{{ info.users }}" wx:if="{{ info.users && info.users.id }}" />
  <view class="main_title">{{ info.title }}</view>
  <view class="time">发布时间：{{ info.publishDt }}</view>
  <view class="fullview_wrap">

 wechat_jiaxuan/pages/detailDis/realpic.js

@@ -20,7 +20,7 @@
    this.setData({
      bottomLift: app.bottomLift
    })
    this.getDetail(options.id)
    this.getDetail(options.id, options.userId || '')
    actionDo({
      actionType: 'view',
      id: options.id
@@ -42,8 +42,8 @@
      this.setData({info})
    })
  },
  getDetail(id) {
    getRealcaseInfo({id}).then(res => {
  getDetail(id, userId) {
    getRealcaseInfo({id, salesId: userId || null}).then(res => {
      this.setData({ info: res.data })
      wx.setNavigationBarTitle({
        title: res.data.title

 wechat_jiaxuan/pages/detailDis/realpic.json

@@ -1,6 +1,7 @@
{
  "usingComponents": {
    "van-popup": "@vant/weapp/popup/index"
    "van-popup": "@vant/weapp/popup/index",
    "idCard": "../../components/idCard/index"
  },
  "navigationBarTitleText": ""
}

 wechat_jiaxuan/pages/detailDis/realpic.wxml

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

 wechat_jiaxuan/pages/store/staff.less

@@ -114,7 +114,6 @@

  .line {
    display: flex;
    align-items: center;
    font-size: 30rpx;
    margin-bottom: 42rpx;
    .icon {
@@ -125,6 +124,9 @@
      margin-left: 24rpx;
      margin-right: 44rpx;
    }
    .val{
      flex: 1;
    }
  }
}
.footer{

 wechat_jiaxuan/pages/store/staff.wxml

@@ -20,7 +20,7 @@
      <view class="card">
        <image src="../../static/images/mingpian_bg_nianxian.png" class="bg"></image>
        <view>从业年限</view>
        <view class="num">{{ info.jobDate || '-' }}</view>
        <view class="num">{{ info.jobDate || '1' }}</view>
      </view>
      <view class="card">
      <image src="../../static/images/mingpian_bg_kehu.png" class="bg"></image>

 wechat_jiaxuan/pages/store/staff.wxss

@@ -102,7 +102,6 @@
}
.guide .line {
  display: flex;
  align-items: center;
  font-size: 30rpx;
  margin-bottom: 42rpx;
}
@@ -114,6 +113,9 @@
  margin-left: 24rpx;
  margin-right: 44rpx;
}
.guide .line .val {
  flex: 1;
}
.footer {
  display: flex;
  align-items: center;

 wechat_jiaxuan/project.private.config.json

@@ -53,7 +53,7 @@
        },
        {
          "name": "",
          "pathName": "pages/kefu/index",
          "pathName": "pages/store/staff",
          "query": "",
          "launchMode": "default",
          "scene": null

 wechat_jiaxuan/static/icon/ic_dianhua.png

 wechat_jiaxuan/static/icon/ic_mingpian.png

 wechat_jiaxuan/utils/config.js

@@ -1,8 +1,8 @@


// export const baseUrl = 'https://jiaxuan.zbom.com/jx/wechat/' //正式服务器
export const baseUrl = 'http://192.168.0.135:10027' // 本地
// export const baseUrl = 'https://dmtest.ahapp.net/web_interface' //测试服务器

// export const baseUrl = 'http://192.168.0.135:10027' // 本地
export const baseUrl = 'https://dmtest.ahapp.net/web_interface' //测试服务器

// export const imageUrl = 'https://osswebcdn.zbom.com/jiaxuan/images/'