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

liukangdong

2024-07-25 53f95e9936dda1090dcf3870f78427896d28a94d

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

 wechat_staff/api/index.js

@@ -23,6 +23,14 @@
    data
  })
}

export const getUserCard = (data) => {
  return request({
    url: '/web/personnel/getUserCard',
    method: "POST",
    data
  })
}
// 获取手机号
export const getWxMiniPhone = (data) => {
  return request({
@@ -31,6 +39,7 @@
    data
  })
}

// 绑定Openid
export const bindingOpenid = (data) => {
  return request({

 wechat_staff/package-lock.json

@@ -1,54 +1,38 @@
{
  "name": "wechat_staff",
  "version": "1.0.0",
  "lockfileVersion": 3,
  "lockfileVersion": 1,
  "requires": true,
  "packages": {
    "": {
      "name": "wechat_staff",
      "version": "1.0.0",
      "license": "ISC",
      "dependencies": {
        "@vant/weapp": "^1.11.6",
        "hy-event-store": "^1.3.1",
        "miniprogram-sm-crypto": "^0.3.13",
        "moment": "^2.30.1",
        "mp-html": "^2.5.0"
      },
      "devDependencies": {}
    },
    "node_modules/@vant/weapp": {
  "dependencies": {
    "@vant/weapp": {
      "version": "1.11.6",
      "resolved": "https://registry.npmmirror.com/@vant/weapp/-/weapp-1.11.6.tgz",
      "integrity": "sha512-a3heReWYT2gNdsyj6x1hBwsM8V8NrjcPAmle86NH2CD2V/i/h0le75piW6KntSfOPCwekVWMBKhysNrBpJeKdw=="
    },
    "node_modules/hy-event-store": {
    "hy-event-store": {
      "version": "1.3.1",
      "resolved": "https://registry.npmjs.org/hy-event-store/-/hy-event-store-1.3.1.tgz",
      "resolved": "https://registry.npmmirror.com/hy-event-store/-/hy-event-store-1.3.1.tgz",
      "integrity": "sha512-uD+14mz4ONiAs9cX/csjUJ2pHTPFciE3JvIbZ+lsbaXopZWbnETEjwJ0a4l5GqNGcltcW3gJjlnUXCJPBoABfg=="
    },
    "node_modules/jsbn": {
    "jsbn": {
      "version": "1.1.0",
      "resolved": "https://registry.npmmirror.com/jsbn/-/jsbn-1.1.0.tgz",
      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A=="
    },
    "node_modules/miniprogram-sm-crypto": {
    "miniprogram-sm-crypto": {
      "version": "0.3.13",
      "resolved": "https://registry.npmmirror.com/miniprogram-sm-crypto/-/miniprogram-sm-crypto-0.3.13.tgz",
      "integrity": "sha512-H7qwbCEmIXZzekCSgEWeHh1mb4cnz0E42YH3U5xqpOaJBB2Sj9ySq0hTGv0f+Jwo5SknABR6fw+EtjnMyJ/O/Q==",
      "dependencies": {
      "requires": {
        "jsbn": "^1.1.0"
      }
    },
    "node_modules/moment": {
    "moment": {
      "version": "2.30.1",
      "resolved": "https://registry.npmmirror.com/moment/-/moment-2.30.1.tgz",
      "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
      "engines": {
        "node": "*"
      }
      "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how=="
    },
    "node_modules/mp-html": {
    "mp-html": {
      "version": "2.5.0",
      "resolved": "https://registry.npmmirror.com/mp-html/-/mp-html-2.5.0.tgz",
      "integrity": "sha512-uvBH5tIaDIlj8qaxsvNXU3RKX0jvXOo3J6FAi/notUv/ds6j79UUTE82aDkxxUk0eLUU0CiCqMrR7WWnytk30Q=="

 wechat_staff/pages/promotion/index.js

@@ -23,6 +23,10 @@
      page:this.data.page,
      model:{type:0}})
      .then(res =>{
        wx.stopPullDownRefresh()
        if(this.data.page ==1){
          this.setData({list:[]})
        }
        if(this.data.page == res.data.page){ 
          res.data.records.forEach(element => { 
            element.createDate = moment(element.createDate).format("yyyy/MM/DD")  
@@ -182,7 +186,9 @@
   * 页面相关事件处理函数--监听用户下拉动作
   */
  onPullDownRefresh() {

    console.log('下拉刷新')  
    this.setData({ page: 1 })
    this.getList() 
  },
 
  /**

 wechat_staff/pages/promotion/index.json

@@ -1,4 +1,5 @@
{
  "usingComponents": {},
  "enablePullDownRefresh": true,
  "navigationBarTitleText": "最新推广资讯"
}

 wechat_staff/pages/userinfo/index.wxml

@@ -26,25 +26,25 @@
            </view>
          </picker>
        </view>
        <view wx:else class="input"><text>{{ userInfo.jobDate }} 年</text></view>
        <view wx:else class="input"><text>{{ userInfo.jobDate || '0' }} 年</text></view>
      </view>
    </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="text" border="{{false}}" class="input" model:value="{{ costomerNum || '0'  }}" maxlength="{{ 5 }}" clearable />
      <view wx:else class="input">{{ costomerNum }}</view>
    </view>
    <view class="line">
      <view class="label">门店名称</view>
      <view class="input">{{ userInfo.shopName }}</view>
      <view class="input">{{ userInfo.shopName || '' }}</view>
    </view>
    <view class="line">
      <view class="label">门店城市</view>
      <view class="input">{{ userInfo.shopCity }}</view>
      <view class="input">{{ userInfo.shopCity || '' }}</view>
    </view>
    <view class="line">
      <view class="label">门店地址</view>
      <view class="input">{{ userInfo.shopAddress }}</view>
      <view class="input">{{ userInfo.shopAddress || '' }}</view>
    </view>
    <view class="line">
      <view class="label">微信二维码</view>

 wechat_staff/utils/config.js

@@ -1,7 +1,5 @@


// 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 baseUrl = 'http://zbtest.ahapp.net/zbom_interface/jx/wechat/' //测试服务器

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