From f8867b8df117d1ac0f1311970994e15059c3da03 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期四, 05 九月 2024 15:57:36 +0800
Subject: [PATCH] add 兼容扫码问题
---
sub_pages/partner/markup-config/markup-config.vue | 129 +++++++++++++++++++++++++++----------------
1 files changed, 81 insertions(+), 48 deletions(-)
diff --git a/sub_pages/partner/markup-config/markup-config.vue b/sub_pages/partner/markup-config/markup-config.vue
index 897344f..f77f8fa 100644
--- a/sub_pages/partner/markup-config/markup-config.vue
+++ b/sub_pages/partner/markup-config/markup-config.vue
@@ -1,62 +1,78 @@
<template>
- <view class="list-container markup-config">
+ <view class="list-container markup-config p20">
<view class="search-container m-t-12 flex">
<view class="flex1 input">
- <u--input placeholder="请输入商品名称" v-model="query.name">
- </u--input>
+ <u-input placeholder="请输入分类名称" v-model="query.name" clearable>
+ <template slot="suffix">
+ <uni-icons color="#20613D" type="search" size="24" @click="refreshList"></uni-icons>
+ </template>
+ </u-input>
</view>
- <view class="button" @click="refreshList">搜索</view>
</view>
+
+<!-- <view class="m-t-12 text-center bg-white p10" @click="show_time_picker_time=true">
+ {{ !query.time && '请选择时间' || (query.time) }}
+ </view> -->
+
<view class="p15" style="min-height: calc(100vh - 160rpx);">
<no-data v-if="!list||list.length==0" style="width: 100%;"></no-data>
<view v-for="(item,index) in list" :key="index" class="m-b-24 markup-config-list list-container">
<view class="markup-config-item list-item">
<view class="title">
- 商品名称：{{item.name || '-'}}
+ 商品名称：{{ item.name || '-' }}
</view>
- <u-divider></u-divider>
+ <u-divider style="margin-top: 20rpx;padding-top: 20rpx;"></u-divider>
<view class="form">
- <view class="form-item">
- <view class="form-item-label">分类</view>
- <view class="form-item-value">{{item.categoryStr || '-'}}</view>
- </view>
- <view class="form-item">
- <view class="form-item-label">规格</view>
- <view class="form-item-value">{{item.unit || '-'}}</view>
- </view>
- <view class="form-item">
- <view class="form-item-label">规格</view>
- <view class="form-item-value">{{item.unit || '-'}}</view>
+ <view class="flex">
+ <view class="form-item">
+ <view class="form-item-label">分类</view>
+ <view class="form-item-value">{{ item.categoryStr || '-' }}</view>
+ </view>
+ <view class="form-item">
+ <view class="form-item-label">规格</view>
+ <view class="form-item-value">{{ item.unit || '-' }}</view>
+ </view>
</view>
- <view class="form-item">
- <view class="form-item-label">重量</view>
- <view class="form-item-value">{{item.weight || '-'}}</view>
+ <view class="flex">
+ <view class="form-item">
+ <view class="form-item-label">规格</view>
+ <view class="form-item-value">{{ item.unit || '-' }}</view>
+ </view>
+ <view class="form-item">
+ <view class="form-item-label">重量</view>
+ <view class="form-item-value">{{ item.weight || '-' }}</view>
+ </view>
</view>
- <view class="form-item">
- <view class="form-item-label">颜色</view>
- <view class="form-item-value">{{item.color || '-'}}</view>
+ <view class="flex">
+ <view class="form-item">
+ <view class="form-item-label">颜色</view>
+ <view class="form-item-value">{{ item.color || '-' }}</view>
+ </view>
+ <view class="form-item">
+ <view class="form-item-label">级别</view>
+ <view class="form-item-value">{{ item.levelStr || '-' }}</view>
+ </view>
</view>
- <view class="form-item">
- <view class="form-item-label">级别</view>
- <view class="form-item-value">{{item.levelStr || '-'}}</view>
- </view>
- <view class="form-item">
- <view class="form-item-label">供应商价格</view>
- <view class="form-item-value">￥{{item.price || '-'}}</view>
- </view>
- <view class="form-item">
- <view class="form-item-label">加价金额</view>
- <view class="form-item-value">{{item.fee || '-'}}</view>
+ <view class="flex">
+ <view class="form-item">
+ <view class="form-item-label">供应商价格</view>
+ <view class="form-item-value">￥{{ item.price || '-' }}</view>
+ </view>
+ <view class="form-item">
+ <view class="form-item-label">加价金额</view>
+ <view class="form-item-value">{{ item.fee || '-' }}</view>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="form-item-label">供应商名称</view>
+ <view class="form-item-value">{{ item.supplierName || '-' }}</view>
</view>
<view class="form-item">
<view class="form-item-label">审核时间</view>
- <view class="form-item-value">{{item.auditTime || '-'}}</view>
+ <view class="form-item-value">{{ item.auditTime || '-' }}</view>
</view>
- <view class="form-item">
- <view class="form-item-label">供应商名称</view>
- <view class="form-item-value">{{item.supplierName || '-'}}</view>
- </view>
+
</view>
</view>
</view>
@@ -64,6 +80,8 @@
<!-- 判断是否到底了，自动吧 -->
<footer-msg :more="page.total>0&&page.total>page.current*page.size"></footer-msg>
+ <u-datetime-picker :show="show_time_picker_time" @cancel="show_time_picker_time=false"
+ @confirm="select_time_picker_time" v-model="tmp_picker_time" mode="datetime"></u-datetime-picker>
</view>
</template>
@@ -74,8 +92,12 @@
return {
tabIndex: 0,
query: {
- name: ''
- }
+ name: '',
+ time: '',
+ },
+ show_time_picker_time: false,
+ tmp_picker_time: new Date(),
+
}
},
onLoad() {
@@ -84,7 +106,6 @@
},
onReachBottom() {
- this.page.current += 1
this.getMore()
},
async onPullDownRefresh() {
@@ -93,6 +114,16 @@
uni.stopPullDownRefresh()
},
methods: {
+ async select_time_picker_time(e) {
+ console.log('select_time_picker_time', e)
+ var vv = e.value
+ if (vv) {
+ vv = vv.replace('aN:', '00:')
+ }
+ var time = new Date(`2023-8-21 ${vv}:00`)
+ this.show_time_picker_time = false
+ this.query.time = this.$util.toDateMinOnly(time)
+ },
toDetail(item) {
// uni.navigateTo({
// url: `/pages/notice/notice?id=${item.id}`
@@ -106,7 +137,8 @@
.list-container.markup-config {
.search-container {
display: flex;
- margin: 24rpx 30rpx 20rpx 30rpx;
+ // margin: 24rpx 30rpx 20rpx 30rpx;
+
.input {
// flex: 1;
@@ -121,7 +153,7 @@
max-width: 120rpx;
margin-left: auto;
margin-right: 0rpx;
- text-align: right;
+ // text-align: right;
line-height: 70rpx !important;
// height: 58rpx !important;
// display: flex;
@@ -180,8 +212,8 @@
}
.form {
- display: flex;
- flex-wrap: wrap;
+ // display: flex;
+ // flex-wrap: wrap;
.form-item {
height: 40rpx;
@@ -189,8 +221,9 @@
// padding-top: 4rpx;
padding-bottom: 0rpx;
border-bottom: none;
- min-width: 35%;
- max-width: 50%;
+ min-width: unset;
+ max-width: unset;
+ display: flex;
flex: 1;
.form-item-label {}
--
Gitblit v1.9.3