From 0ad6688a4241c20311a173bd9a11944721eefbf5 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 07 八月 2024 14:04:07 +0800
Subject: [PATCH] update 优化
---
sub_pages/supplier/flower-manage/flower-add.vue | 2
sub_pages/partner/delivery/delivery.vue | 2
pages/order/order-sale/order-sale-detail.vue | 17 ++++++--
sub_pages/customer/trade/detail.vue | 52 ++++++++++++++++++++++----
4 files changed, 58 insertions(+), 15 deletions(-)
diff --git a/pages/order/order-sale/order-sale-detail.vue b/pages/order/order-sale/order-sale-detail.vue
index 93997d7..95a53d5 100644
--- a/pages/order/order-sale/order-sale-detail.vue
+++ b/pages/order/order-sale/order-sale-detail.vue
@@ -74,7 +74,8 @@
{{ item.supplierName }}
</view>
<view class="flex m-t-12 flex-wrap-normal">
- <image class="flower-img img100 br-4 m-r-6" :src="item.flowerCover" @click="previewImg(item.flowerCover)">
+ <image class="flower-img img100 br-4 m-r-6" :src="item.flowerCover"
+ @click="previewImg(item.flowerCover)">
</image>
<view class="flex1">
<view class=" flex">
@@ -112,10 +113,7 @@
<view class="label">责任方</view>
<view class="value">{{ item.personInChargeStr || '-' }}</view>
</view>
- <view class="each-item">
- <view class="label">备注</view>
- <view class="value">{{ item.remarks || '-' }}</view>
- </view>
+
<view class="each-item">
<view class="label">赔付金额</view>
<view class="value t-red">￥{{ item.amount || '-' }}</view>
@@ -123,9 +121,18 @@
</view>
</view>
</view>
+ <view class=" m-t-12 flex-wrap-normal" v-if="item.remarks">
+ <view class="each-list">
+ <view class="each-item" style="max-width: 90%;text-align: left;">
+ <view class="label">备注</view>
+ <view class="value">{{ item.remarks || '-' }}</view>
+ </view>
+ </view>
+ </view>
</view>
+
<view class="info-container bg-white br-4">
<view class="form-item">
<view class="label">订单编号:</view>
diff --git a/sub_pages/customer/trade/detail.vue b/sub_pages/customer/trade/detail.vue
index c050b1c..214e032 100644
--- a/sub_pages/customer/trade/detail.vue
+++ b/sub_pages/customer/trade/detail.vue
@@ -1,7 +1,11 @@
<template>
<view class="trade-detail">
<view class="top-img-container">
+
<image :src="dto.cover" class="top-img" mode="aspectFill"></image>
+
+
+
<view class="icon-container">
<image v-if="!dto.collection" src="../../../static/common/icon-sc.png" @click="collectItem(dto)"
class="icon-sc"></image>
@@ -68,14 +72,6 @@
<view class="label">暂无</view>
</view>
</view>
- <!-- <view class="flex m-t-8">
- <!-- <view class="label">枝粗：</view>-->
- <!-- <view class="value">中等粗细</view>-->
- <!-- </view>-->
- <!-- <view class="flex m-t-8">-->
- <!-- <view class="label">均匀度：</view>-->
- <!-- <view class="value">1-2支不均匀</view>-->
- <!-- </view>-->
</view>
<view class="line">
@@ -92,6 +88,33 @@
<view class="store-to m-l-a m-r-0">进入店铺</view>
</view>
</view>
+
+ <view class="line" v-if="dto.bannerList&&dto.bannerList.length>0">
+
+ </view>
+ <uni-swiper-dot class="uni-swiper-dot-box" :mode="'dot'" field="content"
+ v-if="dto.bannerList&&dto.bannerList.length>0">
+ <swiper class="swiper-box" :interval="10000" :circular="true" :current="0" :autoplay="true">
+ <swiper-item v-for="(url, index) in dto.bannerList" :key="index">
+ <view class="swiper-item" :class="'swiper-item' + index">
+ <image class="home-banner-image" mode="scaleToFill" @click="previewImg(url)" :src="url">
+ </image>
+ </view>
+ </swiper-item>
+ </swiper>
+ </uni-swiper-dot>
+
+ <view class="line" v-if="dto.video">
+
+ </view>
+ <view class="info-brand m-t-12" v-if="dto.video">
+ <video :src="dto.video" :auto-pause-if-navigate="true" style="display: block;margin: 0 auto;"></video>
+
+ </view>
+
+
+
+
<view class="m-t-20 shop-recommend-container" v-if="false">
<view class="shop-recommend-title">店铺推荐</view>
<view class="flex">
@@ -463,6 +486,19 @@
.trade-detail {
background-color: #FFFFFF;
+ swiper {
+ height: 320rpx;
+ }
+
+ .swiper-box {
+ position: relative;
+
+ swiper-item {
+ background-color: #fff;
+ border-radius: 8rpx;
+ }
+ }
+
.image-shop-number {
width: 30rpx;
height: 30rpx;
diff --git a/sub_pages/partner/delivery/delivery.vue b/sub_pages/partner/delivery/delivery.vue
index 167a873..7f172f5 100644
--- a/sub_pages/partner/delivery/delivery.vue
+++ b/sub_pages/partner/delivery/delivery.vue
@@ -86,7 +86,7 @@
const {
code,
data
- } = this.$http.request('get', '/api/delivery/list/view/complete', {
+ } = await this.$http.request('get', '/api/delivery/list/view/complete', {
params: {
id: item.id
}
diff --git a/sub_pages/supplier/flower-manage/flower-add.vue b/sub_pages/supplier/flower-manage/flower-add.vue
index 185a721..312d21f 100644
--- a/sub_pages/supplier/flower-manage/flower-add.vue
+++ b/sub_pages/supplier/flower-manage/flower-add.vue
@@ -158,7 +158,7 @@
</view>
</view>
<view v-if="dto.video">
- <video :src="dto.video" style="display: block;margin: 0 auto;"></video>
+ <video :src="dto.video" :auto-pause-if-navigate="true" style="display: block;margin: 0 auto;"></video>
</view>
<view class="form-item bottom-border-no">
<view class="label">商品描述</view>
--
Gitblit v1.9.3