Merge remote-tracking branch 'origin/v2' into v2

陶杰

2024-09-11 e8d258576a34f35cfefbd6bfe07b7f22e72d87d4

Merge remote-tracking branch 'origin/v2' into v2

# Conflicts:
#	sub_pages/customer/trade/trade.vue

 package.json

@@ -42,8 +42,7 @@
                    "PUB_TYPE": "customer"
                },
                "define": {
                    "PUB_CUSTOMER": true,
                    "PUB_CUSTOMER_DEV": true
                    "PUB_CUSTOMER": true
                }
            }




 pages/user/supplier-user.vue

@@ -40,7 +40,7 @@
                        <span v-if="currentInfo.partnerDTO&&currentInfo.partnerDTO.status!=='P'">

                            ({{ currentInfo.partnerDTO ? currentInfo.partnerDTO.statusStr : '' }})</span>



                        <!-- #ifdef PUB_CUSTOMER_DEV -->

                        <!-- #ifdef PUB_CUSTOMER -->
                        <span class="member-level" @click="goto('/sub_pages/customer/self/member-center',true)"

                            v-if="currentInfo&&currentInfo.customerDTO&&currentInfo.customerDTO.userGrowthRecord">

                            <view v-if="currentInfo.customerDTO.userGrowthRecord.currentMemberLevel=='普通会员'" class="v1">

@@ -108,7 +108,7 @@


        </view>



        <!-- #ifdef PUB_CUSTOMER_DEV -->

        <!-- #ifdef PUB_CUSTOMER -->
        <view class="m-20 coupon-info-container" @click="goto( `/sub_pages/customer/coupon/good-all`,true)"

            v-if="selftype==='customer'||!selftype">

            <view>

@@ -219,7 +219,7 @@
                        </image>

                        <view>投诉反馈</view>

                    </view>

                    <!-- #ifdef PUB_CUSTOMER_DEV -->

                    <!-- #ifdef PUB_CUSTOMER -->
                    <view class="service-icons" @click="goto('/sub_pages/customer/coupon/coupon-self',true)">

                        <image src="../../static/images/customer/service/service-icon-8.png" class="t2 service-icon ">

                        </image>

@@ -232,7 +232,7 @@
                        <view>兑换券</view>

                    </view>

                    <!-- #endif -->

                    <!-- #ifndef PUB_CUSTOMER_DEV -->

                    <!-- #ifndef PUB_CUSTOMER -->
                    <view class="service-icons">



                    </view>


 sub_pages/customer/self/collect.vue

@@ -246,19 +246,12 @@
                            {{ dto.name || '-' }}
                        </view>
                        
                        <!-- #ifdef PUB_CUSTOMER_DEV -->
                        <view class="price m-l-a m-r-0 component-price-new">
                            <span class="tip">会员价</span>￥<span class="p">{{ dto.priceMember || dto.price || '-' }}</span>/扎
                            <view class="component-price-old">
                                ￥{{dto.price}}/扎
                            </view>
                        </view>
                        <!-- #endif -->
                        <!-- #ifndef PUB_CUSTOMER_DEV -->
                        <view class="price m-l-a m-r-0">
                            ￥{{ dto.price || '-' }}/扎
                        </view>
                        <!-- #endif -->
                    </view>
                    <view class="flex">
                        <view class="desc p-t-12 flex" @click.stop="toDetail(dto)">

 sub_pages/customer/self/history.vue

@@ -234,19 +234,13 @@
                            {{ dto.name || '-' }}
                        </view>
                        
                        <!-- #ifdef PUB_CUSTOMER_DEV -->
                        <view class="price m-l-a m-r-0 component-price-new">
                            <span class="tip">会员价</span>￥<span class="p">{{ dto.priceMember || dto.price || '-' }}</span>/扎
                            <view class="component-price-old">
                                ￥{{dto.price}}/扎
                            </view>
                        </view>
                        <!-- #endif -->
                        <!-- #ifndef PUB_CUSTOMER_DEV -->
                        <view class="price m-l-a m-r-0">
                            ￥{{ dto.price || '-' }}/扎
                        </view>
                        <!-- #endif -->

                    </view>
                    <view class="flex">
                        <view class="desc p-t-12 flex" @click.stop="toDetail(dto)">

 sub_pages/customer/shop/shop.vue

@@ -105,19 +105,12 @@
                            <view class="m-l-12 info-container flex1">

                                <view class="title" @click.stop="toDetail(item)">

                                    {{item.name}}

                                    <!-- #ifdef PUB_CUSTOMER_DEV -->

                                    <view class="price component-price-new">

                                        <span class="tip">会员价</span>￥<span class="p">{{item.priceMember||item.price}}</span>/扎

                                        <view class="component-price-old">

                                            ￥{{item.price}}/扎

                                        </view>

                                    </view>

                                    <!-- #endif -->

                                    <!-- #ifndef PUB_CUSTOMER_DEV -->

                                    <view class="price">

                                        ￥{{item.price}}/扎

                                    </view>

                                    <!-- #endif -->



                                </view>

                                <view class="tags" v-if="item.tags||false" @click.stop="toDetail(item)">


 sub_pages/customer/shopping/confirm.vue

@@ -407,7 +407,6 @@
            </view>

            <view class="p10 bg-white m-t-20 br-4">
                <!-- #ifdef PUB_CUSTOMER_DEV -->
                <view class="form-item  flex ">
                    <view class="label">优惠券</view>

@@ -417,7 +416,6 @@
                        <u-icon class="m-l-a" name="arrow-right"></u-icon>
                    </view>
                </view>
                <!-- #endif -->

                <view class="form-item  flex m-t-12">
                    <view class="label">特殊需求</view>
@@ -439,7 +437,6 @@
                        </view>
                    </view>
                </view>
                <!-- #ifdef PUB_CUSTOMER_DEV -->
                <view class="form-item  flex ">
                    <view class="label">兑换券</view>

@@ -450,7 +447,6 @@
                        <u-icon class="m-l-a" name="arrow-right"></u-icon>
                    </view>
                </view>
                <!-- #endif -->
            </view>

        </view>

 sub_pages/customer/trade/detail.vue

@@ -72,7 +72,6 @@
                <view class=" ">{{ dto.unit || '-' }}</view>

            </view>

            <view class="flex m-t-12">
                <!-- #ifdef PUB_CUSTOMER_DEV -->
                <view>
                    <view class="price m-r-a component-price-new">
                        <span class="tip">会员价</span><span class="num p">{{ dto.priceMember || dto.price || '-' }}</span>
@@ -83,13 +82,8 @@
                        元/扎
                    </view>
                </view>
                <!-- #endif -->
                <!-- #ifndef PUB_CUSTOMER_DEV -->
                <view class="price m-r-a">
                    <span class="num">{{ dto.price || '-' }}</span>
                    元/扎
                </view>
                <!-- #endif -->


                

                

                <view class="m-l-a m-r-15">


 sub_pages/customer/trade/list.vue

@@ -74,19 +74,13 @@
                        <view class="title">

                            {{item.name||'-'}}

                            
                            <!-- #ifdef PUB_CUSTOMER_DEV -->
                            <view class="price component-price-new">
                                <span class="tip">会员价</span>￥<span class="p">{{item.priceMember||item.price}}</span>/扎
                                <view class="component-price-old">
                                    ￥{{item.price}}/扎
                                </view>
                            </view>
                            <!-- #endif -->
                            <!-- #ifndef PUB_CUSTOMER_DEV -->
                            <view class="price">
                                ￥{{item.price||0}}元/扎
                            </view>
                            <!-- #endif -->

                            

                        </view>

                        <view class="tags" v-if="item.tags">


 sub_pages/customer/trade/trade.vue

@@ -1,15 +1,12 @@
<template>

    <view class="container-trade" :style="{'min-height':hidefooter?'':'calc(100vh - 20rpx)'}">

        <view class="search-container m-t-12 flex" v-if="!hidefooter">

            <!-- <view class="flex m-r-20">

            <view class="flex m-r-20">
                <view class="m-r-10" style="line-height: 80rpx;" @click="changeSearchType">

                    {{type=='category'?'按分类':'按店铺'}}

                </view>

                <u-icon name="arrow-down"></u-icon>



            </view> -->

            <view class="flex m-r-20">

                <um-dropdown width="200rpx" style="line-height: 80rpx;" @change="fnChange" :defaultIndex="def" rangeKey="label" :optionList="typeList"></um-dropdown>

            </view>

            <view class="flex1 input">

                <u-input :placeholder="type==='category'?'请输入分类名称':'请输入店铺名称'" v-model="query.name" clearable

@@ -58,7 +55,6 @@
                            </view>

                            <view class="cateen_infos list">

                                <view class="title">{{item.name}}</view>
                                <!-- #ifdef PUB_CUSTOMER_DEV -->
                                
                                <view class="price">
                                    <view>会员价</view>
@@ -66,10 +62,7 @@
                                </view>                                
                                <view class="price component-price-old">￥{{item.priceLow || 0}}-{{item.priceHigh||0}}</view>
                                
                                <!-- #endif -->
                                <!-- #ifndef PUB_CUSTOMER_DEV -->
                                <view class="price">￥{{item.priceLow || 0}}-{{item.priceHigh||0}}</view>
                                <!-- #endif -->


                                <view class="desc">在售 {{item.stock||'0'}} 扎</view>

                            </view>



@@ -133,17 +126,7 @@
                },

                currentCategory: {},

                type: 'category', //supplier

                def: 0,
                typeList:[
                   {
                      label: '按分类',
                      value: 'category',
                   },
                   {
                      label: '按店铺',
                      value: 'supplier',
                   },
                ],




            }

        },

@@ -209,9 +192,6 @@
            })

        },

        methods: {

             fnChange(e) {

                        this.type = e.value

                     },

            changeSearchType() {

                if (this.type == 'category') {

                    this.type = 'supplier'