From 6f72ffa93bb3141b22d1c22c3458c04a57e58156 Mon Sep 17 00:00:00 2001
From: xuxy <1059738716@qq.com>
Date: 星期四, 27 六月 2024 10:36:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
sub_pages/farmer/flower-manage/flower-manage.vue | 26 +++++++++++++++-----------
sub_pages/farmer/farmer-info/farmer-info.vue | 12 ++++++------
2 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/sub_pages/farmer/farmer-info/farmer-info.vue b/sub_pages/farmer/farmer-info/farmer-info.vue
index 0f54ae3..0bab6cd 100644
--- a/sub_pages/farmer/farmer-info/farmer-info.vue
+++ b/sub_pages/farmer/farmer-info/farmer-info.vue
@@ -106,19 +106,19 @@
</u-radio-group>
</view>
</view>
- <view class="form-item before-line m-t-20 p-b-20" v-if="dto.idcardType=='身份证'">
+ <view class="form-item bottom-border-no before-line m-t-20 p-b-20" v-if="dto.idcardType=='身份证'">
<view class="label required">身份证正反面</view>
<view class="m-l-a m-r-0 flex">
- <view class="component-button-upload m-r-15" @click="uploadIcon('idCards')">
+<!-- <view class="component-button-upload m-r-15" @click="uploadIcon('idCards')">
- </view>
+ </view> -->
<view class="component-button-upload" @click="uploadIcon('idCards')">
</view>
</view>
</view>
<view class="flex p20" style="padding-top: 0rpx;padding-bottom: 10rpx"
- v-if="dto.idCards&&dto.idCards.length>0">
+ v-if="dto.idcardType=='身份证'&&dto.idCards&&dto.idCards.length>0">
<view class="m-t-12 m-r-10 " v-for="(tBanner,index) of dto.idCards" :key="index">
<image class="banner-img" :src="tBanner.url" @click.stop="previewImg(tBanner.url)">
@@ -126,7 +126,7 @@
<view class="t-red text-center" @click.stop="deleteImg('idCards',index)">删除</view>
</view>
</view>
- <view class="form-item before-line m-t-20 p-b-20" v-if="dto.idcardType=='营业执照'">
+ <view class="form-item bottom-border-no before-line m-t-20 p-b-20" v-if="dto.idcardType=='营业执照'">
<view class="label required">营业执照</view>
<view class="m-l-a m-r-0 flex">
<view class="component-button-upload m-r-15" @click="uploadIcon('pictures')">
@@ -136,7 +136,7 @@
</view>
</view>
<view class="flex p20" style="padding-top: 0rpx;padding-bottom: 10rpx"
- v-if="dto.pictures&&dto.pictures.length>0">
+ v-if="dto.idcardType=='营业执照'&&dto.pictures&&dto.pictures.length>0">
<view class="m-t-12 m-r-10 " v-for="(tBanner,index) of dto.pictures" :key="index">
<image class="banner-img" :src="tBanner.url" @click.stop="previewImg(tBanner.url)">
diff --git a/sub_pages/farmer/flower-manage/flower-manage.vue b/sub_pages/farmer/flower-manage/flower-manage.vue
index 9734e0a..0bd28a6 100644
--- a/sub_pages/farmer/flower-manage/flower-manage.vue
+++ b/sub_pages/farmer/flower-manage/flower-manage.vue
@@ -61,10 +61,10 @@
<view class="buttons">
<view class="button" @click.stop="toDetail(item)">编辑</view>
- <view class="button" @click.stop="buttonStatus(item,'FORCE_OFF')"
- v-if="item.status=='FORCE_UP'">下架</view>
- <view class="button" @click.stop="buttonStatus(item,'FORCE_UP')"
- v-if="item.status=='FORCE_OFF'">上架</view>
+ <view class="button" @click.stop="buttonStatus(item,'OFF')"
+ v-if="item.status=='UP'">下架</view>
+ <view class="button" @click.stop="buttonStatus(item,'UP')"
+ v-if="item.status=='OFF'||item.status=='FORCE_OFF'">上架</view>
<view class="button" @click.stop="openValue(item,'price')">价格</view>
<view class="button" @click.stop="openValue(item,'stock')">库存</view>
<view class="button" @click.stop="toDetailAdd(item)">复制</view>
@@ -147,8 +147,12 @@
title = '商品管理-已上架'
}
if (this.type === 'unpass') {
+ this.query.status = 'DRAFT,OFF,FORCE_OFF'
+ title = '商品管理-仓库中'
+ }
+ if (this.type === 'rejectpass') {
this.query.status = 'REJECT'
- title = '商品管理-审核拒绝'
+ title = '商品管理-未审核通过'
}
}
if (title) {
@@ -217,7 +221,7 @@
})
},
async buttonStatus(item, status) {
- await this.$message.confirm(`确定${status==='FORCE_OFF'?'下降':'上架'}此商品吗`)
+ await this.$message.confirm(`确定${status==='OFF'?'下降':'上架'}此商品吗`)
this.$message.showLoading()
this.$http.request('get', '/api/supplier/flower/list/' + status, {
params: {
@@ -227,7 +231,7 @@
if (res.code == 0) {
this.$message.showToast('操作成功')
item.status = status
- item.statusStr = (status == 'FORCE_OFF' ? '下架' : '上架')
+ item.statusStr = (status == 'OFF' ? '下架' : '上架')
}
}).finally(() => {
this.$message.hideLoading()
@@ -251,23 +255,23 @@
},
toDetail(item) {
uni.navigateTo({
- url: '/pages/farmer/flower-manage/flower-add?id=' + item.id
+ url: '/sub_pages/farmer/flower-manage/flower-add?id=' + item.id
})
},
toDetailAdd(item) {
uni.navigateTo({
- url: '/pages/farmer/flower-manage/flower-add?copyId=' + item.id
+ url: '/sub_pages/farmer/flower-manage/flower-add?copyId=' + item.id
})
},
clickButton(type) {
if (type == 'add') {
//添加页面
uni.navigateTo({
- url: '/pages/farmer/flower-manage/flower-add'
+ url: '/sub_pages/farmer/flower-manage/flower-add'
})
} else {
uni.navigateTo({
- url: '/pages/farmer/flower-manage/flower-manage?type=' + type
+ url: '/sub_pages/farmer/flower-manage/flower-manage?type=' + type
})
}
},
--
Gitblit v1.9.3