jiangping
2023-09-21 2be17adffb5e055ed563ba73c928a5842c45a81e
属性对比
已修改6个文件
18 ■■■■■ 文件已修改
company_admin/.env.development 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
company_admin/src/views/business/goods.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
h5/pages/index/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/company/src/main/resources/application.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company_admin/.env.development
@@ -3,7 +3,7 @@
# VUE_APP_API = 'https://dmtest.ahapp.net/preselect_interface/'
VUE_APP_API = 'http://192.168.0.15:10022/'
VUE_APP_API = 'http://192.168.0.35:10022/'
# VUE_APP_API = 'https://dmtest.ahapp.net/preselect_web_interface/'
company_admin/src/views/business/goods.vue
@@ -68,7 +68,7 @@
          <el-button type="primary" :loading="isWorking.export" @click="bulkOperation(0)">批量上架</el-button>
          <el-button type="primary" :loading="isWorking.export" @click="bulkOperation(1)">批量下架</el-button>
          <!-- <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:goods:delete']">删除</el-button></li> -->
          <el-button style="background: red;border-color:red" type="primary" :loading="isWorking.export" @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:goods:delete']">批量删除</el-button>
        </ul>
        <el-table
          v-loading="isWorking.search"
h5/pages/index/index.vue
@@ -231,7 +231,7 @@
                                        <view class="label">{{child.name}}:</view>
                                        <view class="value">{{child.val}}</view>
                                    </view>
                                    <view v-if="item.param2" class="paramline"></view>
                                    <view v-if="item.param2.length>0" class="paramline"></view>
                                    <view class="item" v-if="item.param2" v-for="(child, j) in item.param2" :key="child.index">
                                        <view class="label">{{child.name}}:</view>
                                        <view class="value">{{child.val}}</view>
server/company/src/main/resources/application.yml
@@ -11,7 +11,7 @@
#  application:
#    name: doumeemes
  profiles:
    active: pro
    active: dev
  # JSON返回配置
  jackson:
server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java
@@ -525,7 +525,10 @@
            return;
        }
        String attrName = attr.substring(0,index);
        if(StringUtils.isBlank(attrName) || StringUtils.equals(attrName, "商品名称") || StringUtils.equals(attrName, "商品编号")){
        if(StringUtils.isBlank(attrName)
                || StringUtils.equals(attrName, "商品名称")
                || StringUtils.equals(attrName, "商品编号")
                || StringUtils.equals(attrName, "店铺")){
            return;
        }
        String val = attr.substring(index+1);
server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
@@ -401,7 +401,10 @@
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }
        goodsMapper.deleteBatchIds(ids);
        for(Integer id : ids){
            deleteById(id);
        }
//        goodsMapper.deleteBatchIds(ids);
    }
    @Override