提交

jiangping

2024-07-26 f108638403b337798d862b61c063f295e177ba6b

提交

 admin/.env.development

@@ -1,3 +1,3 @@
# 开发环境配置
NODE_ENV = 'development'
VUE_APP_BASE_API = 'http://192.168.0.135:10028'
VUE_APP_BASE_API = 'http://localhost:10028'

 admin/admin/template/fcode.xlsx

Binary files differ

 server/service/src/main/java/com/doumee/dao/admin/request/FcodeImport.java

@@ -40,4 +40,8 @@
    private String legalIdcode;
    @ExcelColumn(name="纳税登记证号码",value = "legalIdcode",index = 14)
    private String taxRegCode;
    @ExcelColumn(name="SCODE",value = "SCODE",index = 15)
    private String scode;
    @ExcelColumn(name="FCODE",value = "fcode",index = 16)
    private String fcode;
}

 server/service/src/main/java/com/doumee/dao/admin/request/ShopImport.java

@@ -30,4 +30,6 @@
    private String parentOrgId;
    @ExcelColumn(name="品类编码",value = "品类编码",index = 9)
    private String unitCode;
    @ExcelColumn(name="SCODE",value = "SCODE",index = 10)
    private String scode;
}

 server/service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java

@@ -364,6 +364,8 @@
                shop.setLegalPhone(model.getLegalPhone());
                shop.setLegalIdcode(model.getLegalIdcode());
                shop.setLegalName(model.getLegalName());
                shop.setFcode(model.getFcode());
                shop.setScode(model.getScode());
                shop.setTaxRegCode(model.getTaxRegCode());
                shopMapper.updateById(shop);
            }
@@ -742,6 +744,7 @@
            shop.setSecondType(model.getSecondType());
            shop.setAttribute(model.getAttribute());
            shop.setParentIamId(model.getParentOrgId());
            shop.setScode(model.getScode());
            newList.add(shop);
        }else {
            shop.setEditor(loginUserInfo.getId());
@@ -750,6 +753,7 @@
            shop.setSecondType(model.getSecondType());
            shop.setName(model.getName());
            shop.setCode(model.getCode());
            shop.setScode(model.getScode());
            shop.setUnitCode(model.getUnitCode());
            if(Constants.equalsInteger(model.getStatus(),Constants.TWO)){
                shop.setIsdeleted(Constants.ONE);

 server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java

@@ -728,7 +728,9 @@
    private String dealShareImgNoUser(ContentShareImgDto param, Users users, String shareFolder, String path) {
       String url =null;
        //内容分享海报图片
        //内容分享海报图片
        InputStream mpCode =  Constants.generateWxMiniImgStream(systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG, Constants.WX_TOKEN_CUSTOMER).getCode(),
                //"userId="+users.getId()+"&articleId="+param.getArticleId(),
                param.getArticleId()+"_"+users.getId(),
                param.getPageUrl());//小程序


 wechat_staff/api/index.js

@@ -13,7 +13,7 @@
export const loginByPhone = (data) => {
  return request({
    url: '/web/personnel/loginByPhone',
    data
    datas
  })
}
// 发送验证码
@@ -196,6 +196,13 @@
    data
  })
}
// 获取门店详情
export const loadShopList= (data) => {
  return request({
    url: '/web/personnel/userShopList',
    data
  })
}
// 我的 收藏/喜欢列表
export const collectLikePage = (data) => {
  return request({

 wechat_staff/app.json

@@ -58,7 +58,7 @@
    ]
  },
  "window": {
    "navigationBarTitleText": "志邦家选",
    "navigationBarTitleText": "ZB优家",
    "navigationBarTextStyle": "black",
    "navigationBarBackgroundColor": "#fff"
  },

 wechat_staff/components/buoyClient/index.wxml

@@ -3,7 +3,7 @@
    <view class="item" data-i="0" bindtap="jumpPage">
      <image src="../../static/icon/ic_kehuxihuan.png" mode="widthFix"></image>
      <view>客户喜欢</view>
      <view class="activeNum">{{ enjoyList.length }}</view>
      <view class="activeNum" wx:if="{{enjoyList.length}}">{{ enjoyList.length }}</view>
    </view>
    <view wx:if="{{ showPurpose && showPurpose == '1' }}" class="item" data-i="2" bindtap="jumpPage">
      <image src="../../static/icon/ic_yixiang.png" mode="widthFix"></image>

 wechat_staff/components/disRealpic/index.wxml

@@ -37,7 +37,7 @@
      </view>
      <!-- goods_list -->
      <scroll-view bindscrolltolower="scrolltolower" scroll-y enable-passive enable-flex class="goods_list">
        <view wx:for="{{ dataList }}" data-item="{{item}}" class="item" bindtap="handleDetail">
        <view wx:for="{{ dataList }}" data-index="index" data-item="{{item}}" class="item {{(index%2 == 0 && index == dataList.length-1)?'lastitem':''}}" bindtap="handleDetail">
          <view class="img_wrap">
            <image src="{{ item.coverImage }}" class="img"></image>
            <view wx:if="{{ item.openType == 'link' }}" data-item="{{item}}" bindtap="priviewFull" class="full">

 wechat_staff/components/disRealpic/index.wxss

@@ -130,11 +130,15 @@
  box-sizing: border-box;
  display: flex;
  flex-wrap: wrap;
  justify-content: space-around;
  justify-content: space-around; 
}
.main_content .goods_list .item {
.main_content .goods_list  .lastitem { 
 margin-right: auto; 
}
 
.main_content .goods_list .item { 
  width: 324rpx;
  margin-bottom: 32rpx;
  margin-bottom: 32rpx; 
}
.main_content .goods_list .item .img_wrap {
  width: 100%;

 wechat_staff/pages/consult/detail.wxml

@@ -15,14 +15,13 @@
        <image class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
        <view class="name">收藏</view>
      </view> -->
      <button open-type="share" class="item" bindtap="handleShare">
      <!-- <button open-type="share" class="item" bindtap="handleShare">
        <image class="icon" src="../../static/icon/detail_nav_share.png" mode="widthFix"></image>
        <view class="name">分享</view>
      </button> -->
      <button class="sub_btn" open-type="share" bindtap="handleShare"> 
        <view>分享</view>
      </button>
      <view class="sub_btn" bindtap="handleDesign">
        <image class="sheji" src="../../static/icon/ic_sheji.png" mode="widthFix"></image>
        <view>免费预约专属设计</view>
      </view>
    </view>
  </view>
  <!--  -->

 wechat_staff/pages/detailDis/product.wxss

@@ -150,7 +150,7 @@
}
.detail .line {
  display: flex;
  height: 32rpx;
  min-height: 32rpx;
  margin-bottom: 24rpx;
}
.detail .line .label {

 wechat_staff/pages/kefu/index.js

@@ -40,7 +40,7 @@
          console.log('连接客服成功');
        }
      })
    } catch (error) {
    } catch (error) { 
      wx.showToast({
        title: '请更新至微信最新版本',
        icon: 'none'

 wechat_staff/pages/kefu/index.wxml

@@ -10,9 +10,10 @@
        <image class="icon" src="../../static/icon/detail_nav_share.png" mode="widthFix"></image>
        <view class="name">分享</view>
      </button>
      <view class="sub_btn" bindtap="toSever">
      <view class="sub_btn"   >
        <image class="icon" src="../../static/icon/home_ic_kefu.png" mode="widthFix"></image>
        <view>立即咨询客服</view>
        <button class="sub_btn1" open-type="contact" bindcontact="handleContact">立即咨询客服</button>
        <!-- <view>立即咨询客服</view> -->
      </view>
    </view>
  </view>

 wechat_staff/pages/kefu/index.wxss

@@ -26,8 +26,19 @@
  font-weight: 500;
  color: #FFFFFF;
  font-style: 28rpx;
  box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(176, 135, 113, 0.3), inset 0rpx 2rpx 2rpx 0rpx rgba(255, 255, 255, 0.33);
  border-radius: 8rpx;
  background: linear-gradient( 180deg, #E0B49C 0%, #B68B74 100%);
  box-shadow: 0px 4px 16px 0px rgba(176,135,113,0.3), inset 0px 2px 2px 0px rgba(255,255,255,0.33);
  border-radius: 8px;
 
}
.footer   .sub_btn1 { 
  height: 72rpx;  
  font-weight: 500;
  color: #FFFFFF;
  font-style: 28rpx;  
  display:contents;
  border: none;
  background: none;
}
.footer .sub_btn .icon {
  width: 34rpx;

 wechat_staff/pages/login/index.js

@@ -122,7 +122,7 @@
    getWxMiniPhone({
      encryptedData: data.encryptedData,
      iv: data.iv,
      sessionKey: wx.getStorageSync('sessionKey') || data.iv,
      sessionKey: wx.getStorageSync('sessionKey'),
    }).then(res => {
      if (res.data && res.data.token) {
        wx.login({

 wechat_staff/pages/sets/index.wxml

@@ -8,18 +8,23 @@
      <view class="name">《ZBOM用户隐私协议》</view>
      <image class="icon" src="../../static/icon/home_ar@2x.png" mode="widthFix"></image>
    </view>
    <view class="line" bindtap="showLogout">
      <view class="name">注销账号</view>
    <!-- <view class="line" bindtap="showLogout">
      <view class="name">切换账号</view>
      <image class="icon" src="../../static/icon/home_ar@2x.png" mode="widthFix"></image>
    </view> -->

    <view class="outbut" >
      <button  bindtap="showLogout" class="btn">退出登录</button> 
    </view>
  </view>
  
  <!--  -->
  <van-popup show="{{ show }}" bind:close="onClose">
    <view class="modal">
        <view class="title">注销提醒</view>
        <view class="text">如您不再使用此账号，可以将其注销。账号成功注销后，其下所有数据将会被删除并将无法恢复，请谨慎操作</view>
        <view class="title">退出登录提醒</view>
        <view class="text">您确认退出当前登录账号吗？</view>
        <view class="btns">
          <view class="btn" bind:tap="logout">确认注销</view>
          <view class="btn" bind:tap="logout">确认退出</view>
          <view class="btn cancel" bindtap="onClose">还是算了</view>
        </view>
    </view>

 wechat_staff/pages/sets/index.wxss

@@ -53,3 +53,20 @@
  color: #fff;
  background-color: var(--themeColor);
}
.outbut{
  width: 100%; 
  margin-top: 100rpx;
}
.outbut .btn{
  width: 100%;
  height: 88rpx;
  font-weight: 500;
  font-size: 32rpx;
  color: #B08771;
  line-height: 88rpx;
  text-align: center;
  font-style: normal;
  border-radius: 8rpx;
  border: 1px solid #B08771; 
  color: rgba(176, 135, 113, 1);
}

 wechat_staff/pages/store/index.js

@@ -1,4 +1,4 @@
import { getShopDetail } from '../../api/index'
import { getShopDetail,loadShopList } from '../../api/index'
// pages/store/index.js
Page({

@@ -7,19 +7,43 @@
   */
  data: {
      shopId: null,
      shopInfo:{}
  },
      shopInfo:{},
      shopList:[]
  },buo

  /**
   * 生命周期函数--监听页面加载
   */
  onLoad(options) { 
    console.log(options.shopId)
    this.setData({shopId:options.shopId})
    // this.loadShopList()
    // this.setData({shopId:options.shopId})
  },
  getShopInfo(id){ 
    
    getShopDetail(id).then(res => {
  loadShopList(params) {
    loadShopList({}).then(res => { 
      if(res.data &&res.data){
        const t = '';
        res.data.forEach(item => {
          if(item.seqNameList && item.seqNameList.length){
            const tindex =0;
            item.seqNameList.forEach(element => {
              if(tindex>0){
                t =t+"、"
              }           
               t = t+ element;
               tindex++;
            });
          } 
          item.seqNameInfo = t;
        }); 
      }
      this.setData({
        shopList: res.data || []
      })  
    }) 
  },
  getShopInfo(id){  
     getShopDetail(id).then(res => {
      if(res.data && res.data.seqNameList){
        const t = '';
        const tindex =0;
@@ -38,8 +62,8 @@
    }) 
  },
  handleEdit(e) {
    const {shopInfo} = this.data
    const objString = JSON.stringify(shopInfo);
    // const {shopInfo} = this.data
    const objString = JSON.stringify(e.target.dataset.index);
    console.log(objString) 
    wx.navigateTo({
      url: '/pages/store/info?data='+objString ,
@@ -56,7 +80,8 @@
   * 生命周期函数--监听页面显示
   */
  onShow() { 
    this.getShopInfo(this.data.shopId)
    // this.getShopInfo(this.data.shopId)
    this.loadShopList()
  },

  /**

 wechat_staff/pages/store/index.wxml

@@ -1,24 +1,24 @@
<view class="container">
  <view class="list">
  <view class="list" wx:for="{{shopList}}" wx:for-item="item" >
    <view class="item">
      <view class="name">{{shopInfo.name}}</view>
      <view class="name">{{item.name  || ''}}</view>
      <view class="line">
        <view class="label">联系人</view>
        <view class="val">{{shopInfo.linkerName}}</view>
        <view class="val">{{item.linkerName || ''}}</view>
      </view>
      <view class="line">
        <view class="label">联系电话</view>
        <view class="val">{{shopInfo.linkPhone}}</view>
        <view class="val">{{item.linkPhone || ''}}</view>
      </view>
      <view class="line">
        <view class="label">经营范围</view>
        <view class="val">{{shopInfo.seqNameInfo||''}}</view>
        <view class="val">{{item.seqNameInfo||''}}</view>
      </view>
      <view class="line">
        <view class="label">门店地址</view>
        <view class="val">{{shopInfo.address}}</view>
        <view class="val">{{item.address || ''}}</view>
      </view>
      <view bindtap="handleEdit" class="edit">编辑</view>
      <view bindtap="handleEdit" data-index="{{item}}" class="edit">编辑</view>
    </view>
  </view>
</view>

 wechat_staff/pages/store/info.wxml

@@ -15,7 +15,7 @@
    <view class="line">
      <view class="la">门店经纬度</view>
      <view class="val"  bindtap="getLocation">
        <view class="input">{{ longitude }},{{ latitude }}</view>
        <view class="input">[{{ longitude ||  '' }},{{ latitude  || ''}}]</view>
        <image class="icon" src="../../static/icon/home_ar@2x.png" mode="widthFix"></image>
      </view>
    </view>