Merge remote-tracking branch 'remote-v2/master-2.0' into master-2.0

xuxueyang

2024-09-24 1d782559b682f7eb7a374c2e8017ff65cb941e52

Merge remote-tracking branch 'remote-v2/master-2.0' into master-2.0

 pages/home/supplier-home.vue

@@ -24,11 +24,11 @@
                    ||(currentInfo.supplierDTO&&currentInfo.supplierDTO.cover)
                    ||(currentInfo.partnerDTO&&currentInfo.partnerDTO.cover)
                    || currentInfo.picture
                    " mode="aspectFit"></image>
                    " mode="scaleToFill"></image>
                    
                <image class="user-icon" v-else
                    src='https://youzhen123.oss-cn-huhehaote.aliyuncs.com/WechatOwnerProperty/images/mrtx.png'
                    mode="aspectFit"></image>
                    mode="scaleToFill"></image>
                    
                <!-- 头像 -->
            <!--     <image class="user-icon" v-if="!currentInfo.picture"

 pages/order/order-detail.vue

@@ -111,6 +111,49 @@

        },
        methods: {
			
            openbrand(item) {
                //也要判断一下是否重复进入
                //判断堆栈，如果是店铺，就直接返回
                //或者是：从商铺到列表再到详情，再到商铺，这种也不行
                const pages = getCurrentPages();
                console.log('toShopping', pages)
                if (pages && pages.length >= 2) {
                    if (pages[pages.length - 2].route === "sub_pages/customer/shop/shop") {
                        uni.navigateBack()
                        return
                    }
                }
                if (pages && pages.length >= 3) {
                    if (pages[pages.length - 3].route === "sub_pages/customer/shop/shop" &&
                        pages[pages.length - 2].route === "sub_pages/customer/trade/list"
                    ) {
                        uni.navigateBack({
                            delta: 2
                        })
                        return
                    }
                }
			 
                if (pages.length >= 10) {
                    //直接强制购物车
                    uni.reLaunch({
                        url: '/sub_pages/customer/shop/shop?id=' + (item.supplierId || '')
                    })
                } else {
                    uni.navigateTo({
                        url: '/sub_pages/customer/shop/shop?id=' + (item.supplierId || '')
                    })
                }
		 
         },
			
            toFlowerDetail(item) {
                console.log(item)
                uni.navigateTo({
                    url: `/sub_pages/customer/trade/detail?id=${item.flowerId}`
                })
            },
            salesTypeChange(e) {
                this.submitForm.salesType = e.value
            },
@@ -496,7 +539,7 @@
        <view v-for="(item,index) of list" :key="index">
            <view class="flower-info m-b-20 m-t-12 br-4"
                v-if="!showSales||showSales&&(submitForm.orderItemId == item.id)">
                <view class="supplier-name ">
                <view class="supplier-name " @click.stop="openbrand(item)">
                    <image class="icon-dp" src="/static/common/icon-dp.png"></image>
                    {{ item.supplierName || ''}}
                </view>
@@ -510,7 +553,7 @@
                    <image class="flower-img img100 br-4 m-r-6" :src="item.flowerCover"
                        @click="previewImg(item.flowerCover)">
                    </image>
                    <view class="flex1">
                    <view class="flex1" @click.stop="toFlowerDetail(item)">
                        <view class=" flex">
                            <view class="title"><span class="level">{{ item.flowerCategory || ''}}</span><span
                                    class="level">{{ item.flowerLevelStr || ''}}</span>{{ item.flowerName || ''}}

 pages/order/order.vue

@@ -93,6 +93,49 @@
            uni.stopPullDownRefresh()
        },
        methods: {
			
			
            openbrand(item) {
                console.log(item)
                //也要判断一下是否重复进入
                //判断堆栈，如果是店铺，就直接返回
                //或者是：从商铺到列表再到详情，再到商铺，这种也不行
                const pages = getCurrentPages();
                console.log('toShopping', pages)
                if (pages && pages.length >= 2) {
                    if (pages[pages.length - 2].route === "sub_pages/customer/shop/shop") {
                        uni.navigateBack()
                        return
                    }
                }
                if (pages && pages.length >= 3) {
                    if (pages[pages.length - 3].route === "sub_pages/customer/shop/shop" &&
                        pages[pages.length - 2].route === "sub_pages/customer/trade/list"
                    ) {
                        uni.navigateBack({
                            delta: 2
                        })
                        return
                    }
                }
			
                if (pages.length >= 10) {
                    //直接强制购物车
                    uni.reLaunch({
                        url: '/sub_pages/customer/shop/shop?id=' + (item.supplierId || '')
                    })
                } else {
                    uni.navigateTo({
                        url: '/sub_pages/customer/shop/shop?id=' + (item.supplierId || '')
                    })
                }
			
            },
            toFlowerDetail(item) {
                uni.navigateTo({
                    url: `/sub_pages/customer/trade/detail?id=${item.flowerId}`
                })
            },
            getList_after() {
                var nowdate = new Date().getTime() - 1000 * 60 * 5
                var change = false
@@ -123,6 +166,31 @@
                    url: '/pages/order/order-detail?id=' + item.id
                })
            },
			
            async copyOrder(item){
                console.log(item)
                await this.$message.confirm('是否确定再来一单')
                // 发送请求
                this.$message.showLoading()
                const {
                    code,
                    data,
                    msg
                } = await this.$http.request('get', '/api/customer/order/copyOrder', {
                    params: {
                        id: item.id,
                    }
                })
                this.$message.hideLoading()
                if (code === 0) {
                    //微信接口
                    if(msg&&msg!=""){
                        this.$message.showToast(msg)
                    }
				
                }
            },
			
            toDetailSaleInfo(dto, flower) {
                console.log('flower', dto, flower)
                uni.navigateTo({
@@ -410,15 +478,17 @@
                <view class="flower-info m-b-5 m-t-8 br-4" v-for="(item,j) of dto.items" :key="j">
                    <!-- <view class="line-gray"></view> -->

                    <view class="supplier-name ">
                    <view class="supplier-name " @click.stop="openbrand(item)" >
                        <image class="icon-dp br-4" src="/static/common/icon-dp.png"></image>
                        {{ item.supplierName }}
                    </view>
                    <view class="flex m-t-12 flex-wrap-normal">
                    <view class="flex m-t-12 flex-wrap-normal" >
                        <image class="flower-img img100 m-r-6" :src="item.flowerCover"
                            @click="previewImg(item.flowerCover)">
                        </image>
                        <view class="flex1">
                        <!-- <view class="flex1" @click.stop="toFlowerDetail(item)"> -->
                        <view class="flex1" @click.stop="toDetail(dto)">
							
                            <view class=" flex">
                                <view class="title flex flex1">
                                    <!-- <span class="level">{{ item.flowerCategory }}</span> -->
@@ -505,7 +575,7 @@
                    </view>



                    <!-- <view class="button button-0 m-l-a m-r-15" @click="copyOrder(dto)">再来一单</view> -->
                    <view class="button button-1 m-l-a m-r-0" @click="toDetail(dto)">查看详情</view>
                </view>
            </view>