Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/preselect in...

jiangping

2023-09-22 967e12a05e1a1cb0c595a379c55c5ecc71dd03a9

Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/preselect into dev

 company_admin/.env.production

@@ -3,7 +3,7 @@

# VUE_APP_API = 'https://dmtest.ahapp.net/preselect_interface/'

VUE_APP_API = 'http://127.0.0.1:10022/'
# VUE_APP_API = 'https://dmtest.ahapp.net/preselect_web_interface/'

# VUE_APP_API = 'https://dmtest.ahapp.net/preselect_web_interface/'

@@ -11,6 +11,6 @@

# VUE_APP_API = 'https://dm.ahapp.net/preselect_interface/'

# VUE_APP_API = 'http://yx.doumee.com/preselect_interface/'
VUE_APP_API = 'https://yx.ahapp.net/web_interface/'

# VUE_APP_API = 'http://mjyx.doumee.com/preselect_interface/'

 h5/apis/index.js

@@ -44,3 +44,8 @@
export function getUserInfo() {
    return get('system/getUserInfo')
}

// é€€å‡ºç™»å½•
export function logout(data){
    return post('system/logout', data)
}

 h5/manifest.json

@@ -78,14 +78,18 @@
        "devServer" : {
            "https" : false,
            "proxy" : {
                "/web_interface" : {
                    "target" : "http://127.0.0.1:10022/",
                "/preselect_h5_interface" : {
                    // "target" : "http://127.0.0.1:10022/",
                    // "target" : "http://127.0.0.1:10024/",
                    "target" : "https://dmtest.ahapp.net/preselect_h5_interface/",
                    // "target" : "http://121.41.164.217/",
                    // "target" : "http://192.168.0.15:10022/",
                    // "target" : "https://dmtest.ahapp.net/",
                    "changeOrigin" : true,
                    "secure" : false,
                    "pathRewrite" : {"^/web_interface":""}
                    "pathRewrite": {
                        "^/preselect_h5_interface" : "/"
                    }
                }
            }
        },

 h5/package-lock.json

ÎļþÒÑɾ³ý

 h5/pages/index/index.vue

@@ -263,7 +263,7 @@
    import search from '@/components/search.vue'
    import noData from '@/components/noData.vue'
    import { mapState } from 'vuex'
    import { categoryList, goodsList, brandList, h5Image, goodsPage, listForH5 } from '@/apis/index.js'
    import { categoryList, goodsList, brandList, h5Image, goodsPage, listForH5, logout } from '@/apis/index.js'
    export default {
        data() {
            return {
@@ -424,6 +424,14 @@
                }
            }
        },
        onUnload() {
            //清除
            document.onmouseup = function(ev){
                document.onmousemove = null;
            }
            //清除
            document.onkeydown = null
        },
        computed: {
            // æŒ‡å¯¼ä»·æ€»è®¡
            zdTotalPrice() {
@@ -539,8 +547,11 @@
            },
            // é€€å‡º
            loginOut() {
                logout({})
                    .then(res => {
                this.$store.commit('clean')
                uni.redirectTo({ url: '/pages/login/login' });
                    })
            },
            // æŸ¥è¯¢å•†å“æ•°æ®
            getShopList(type) {
@@ -1122,7 +1133,7 @@
            // min-width: 750px;
            .box_content_left {
                position: fixed;
                left: 50px;
                left: 80px;
                top: 50%;
                cursor: pointer;
                transform: translate(-50%, 0);
@@ -1136,7 +1147,7 @@
            }
            .box_content_right {
                position: fixed;
                right: 50px;
                right: 0px;
                top: 50%;
                cursor: pointer;
                transform: translate(-50%, 0);
@@ -1320,8 +1331,11 @@
                                    font-weight: 500;
                                }
                                .commodityFrom_body_content_item_num_img {
                                    width: 24px;
                                    height: 24px;
                                    width: 28px;
                                    height: 28px;
                                    display: flex;
                                    align-items: center;
                                    justify-content: center;
                                    margin-right: 4px;
                                    image {
                                        width: 100%;
@@ -1373,6 +1387,8 @@
                                        display: flex;
                                        align-items: center;
                                        justify-content: center;
                                        padding: 0 10px;
                                        box-sizing: border-box;
                                        &:hover {
                                            text {
                                                color: #FFF200;
@@ -1560,6 +1576,8 @@
                                line-height: 40px;
                                text-align: center;
                                cursor: pointer;
                                padding: 0 10px;
                                box-sizing: border-box;
                                &:hover {
                                    text {
                                        color: #FFF200;

 h5/utils/request.js

@@ -16,8 +16,9 @@
        // http://127.0.0.1/interface/    http://192.168.0.15:10024/   preselect_web_interface
        // https://dmtest.ahapp.net/preselect_web_interface/${url}   http://127.0.0.1:10022/  http://192.168.0.35:10024/
        // http://127.0.0.1:10024/   æµ‹è¯•
        // https://yx.ahapp.net/h5_interface/${url}
        uni.request({
            url: `http://127.0.0.1:10024/${url}`,
            url: `https://dmtest.ahapp.net/preselect_h5_interface/${url}`,
            method,
            data,
            header: {

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

@@ -327,8 +327,9 @@
        queryWrapper.lambda().orderByAsc(BaseCategory::getSortnum);

        IPage<BaseCategory> baseCategoryIPage = baseCategoryMapper.selectPage(page, queryWrapper);
        String preUrl = getPreUrl();
        if (!CollectionUtils.isEmpty(baseCategoryIPage.getRecords())){
            baseCategoryIPage.getRecords().forEach(s->s.setImgfullurl(getPreUrl()+s.getImgurl()));
            baseCategoryIPage.getRecords().forEach(s->s.setImgfullurl(preUrl+s.getImgurl()));
        }

        return PageData.from(baseCategoryIPage);