From 623859790a3f074c103c792e5eaca33b199dbb91 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 06 八月 2024 15:14:41 +0800
Subject: [PATCH] update 花店端的一些细节功能、打印的、合伙人推广二维码的
---
sub_pages/customer/trade/list.vue | 17 +
pages/home/components/home-search.vue | 39 ++++
pages/home/home.vue | 68 ++++++--
sub_pages/customer/shopping/shopping.vue | 1
pages/user/user-bind-wx/user-bind-wx.vue | 5
pages.json | 6
pages/home/components/home-banner-detail.vue | 212 ++++++++++++++++++++++++++
pages/home/components/home-zones.vue | 2
plugins/http.js | 9 +
store/index.js | 3
sub_pages/supplier/print/print-list.vue | 26 ++-
sub_pages/customer/shop/shop.vue | 10 +
pages/order/order.vue | 20 +
pages/user/supplier-user.vue | 10
14 files changed, 376 insertions(+), 52 deletions(-)
diff --git a/pages.json b/pages.json
index 7ba042c..c5995e0 100644
--- a/pages.json
+++ b/pages.json
@@ -141,6 +141,12 @@
"style": {
"navigationBarTitleText": "搜鲜花"
}
+ },
+ {
+ "path": "pages/home/components/home-banner-detail",
+ "style": {
+ "navigationBarTitleText": "公告"
+ }
}
],
"subPackages": [{
diff --git a/pages/home/components/home-banner-detail.vue b/pages/home/components/home-banner-detail.vue
new file mode 100644
index 0000000..72bf866
--- /dev/null
+++ b/pages/home/components/home-banner-detail.vue
@@ -0,0 +1,212 @@
+<template>
+ <view class="travel-detail">
+ <view v-if="dto.id">
+ <!-- 标题、价格、时间、地点 -->
+ <!-- <view class="infos">
+ <view class="name">{{dto.name||dto.title||'暂无标题'}}</view>
+ </view> -->
+ <!-- <view style="background: #F5F5F5;height: 24rpx;">
+
+ </view>
+ <view class="bg-white p10">
+ <image :src="dto.cover" v-if="dto.cover" mode="aspectFit" class="m-t-8"
+ style="display: block;margin: 0 auto;" @click="previewImg(dto.cover)"></image>
+
+ </view> -->
+ <!-- <view style="background: #F5F5F5;height: 24rpx;">
+
+ </view> -->
+
+ <!-- 活动描述 -->
+ <view class="info-desc">
+ <!-- <view class="title">公告描述</view> -->
+ <view v-html="dto.content||'暂无内容'" class="rich" style="overflow: scroll;">
+
+ </view>
+ </view>
+
+ </view>
+ </view>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+ dto: {
+
+ },
+ peoples: [],
+ id: ''
+ };
+ },
+ async onLoad(options) {
+ this.id = options.id || ''
+ await this.init()
+
+ },
+ async onPullDownRefresh() {
+ await this.init()
+ uni.stopPullDownRefresh()
+ },
+ methods: {
+ async init() {
+ this.$message.showLoading()
+ const {
+ data
+ } = await this.$http.request('get', '/api/pub/banner/page/view?id=' + this.id, {
+
+ })
+
+ this.$message.hideLoading()
+ this.dto = {
+ ...data
+ }
+ uni.setNavigationBarTitle({
+ title: this.dto.name || this.dto.title || '公告'
+ })
+ this.dto.content = this.$util.formatRichText(this.dto.content || '')
+
+ },
+ }
+ }
+</script>
+
+<style lang="scss" scoped>
+ .popup-form {
+ padding-bottom: 68rpx;
+
+ .bottom-img {
+ width: 118rpx;
+ height: 70rpx;
+ display: block;
+ margin: 0 auto;
+ }
+
+ .bottom-info {
+ font-weight: 400;
+ font-size: 28rpx;
+ color: #666666;
+ line-height: 40rpx;
+ text-align: center;
+ }
+
+ .title {
+ font-size: 32rpx;
+ color: #000000;
+ margin-bottom: 32rpx;
+ }
+
+ .people-name {
+ font-weight: 600;
+ font-size: 32rpx;
+ color: #000000;
+ line-height: 102rpx;
+ margin-left: 28rpx;
+ }
+
+ .people-img {
+ width: 102rpx;
+ height: 102rpx;
+ border: 2rpx solid #FFFFFF;
+ }
+ }
+
+ .travel-detail {
+ .info-peoples {
+ padding: 24rpx 30rpx;
+ background: #fff;
+
+ .title {
+ font-size: 32rpx;
+ color: #000000;
+ font-weight: 600;
+
+ }
+
+ .show-more-peoples {
+ font-size: 24rpx;
+ color: #26C3A5;
+ }
+ }
+
+ .info-desc {
+ padding: 24rpx 30rpx;
+ background: #fff;
+
+ .title {
+ margin-bottom: 20rpx;
+ font-weight: 600;
+ font-size: 32rpx;
+ color: #000000;
+ }
+
+ /deep/ img {
+ max-width: 600rpx;
+
+ }
+ }
+
+ .info-cover {
+ width: 750rpx;
+ height: 474rpx;
+ }
+
+ .infos {
+ padding: 24rpx 30rpx;
+ background: #fff;
+
+ .name {
+ font-weight: 600;
+ font-size: 40rpx;
+ color: #000000;
+ }
+
+
+ .price {
+ font-weight: 600;
+ line-height: 72rpx;
+ font-size: 50rpx;
+ color: #000000;
+
+ .dot {
+ font-size: 40rpx;
+ line-height: 56rpx;
+ }
+ }
+
+ .status {
+ width: 132rpx;
+ height: 50rpx;
+ border-radius: 26rpx;
+ border: 2rpx solid #999999;
+ color: #999999;
+ line-height: 50rpx;
+ font-size: 24rpx;
+
+ text-align: center;
+ margin-left: 16rpx;
+ }
+
+ .status.A,
+ .status.J {
+ border: 2rpx solid #04BA97;
+ color: #04BA97;
+ }
+
+ .icon-loc {
+ width: 24rpx;
+ height: 30rpx;
+ background-size: 100% 100%;
+
+ }
+
+ .icon-clock {
+ width: 24rpx;
+ height: 26rpx;
+ background-size: 100% 100%;
+
+ }
+ }
+ }
+</style>
\ No newline at end of file
diff --git a/pages/home/components/home-search.vue b/pages/home/components/home-search.vue
index 328c5b0..157f488 100644
--- a/pages/home/components/home-search.vue
+++ b/pages/home/components/home-search.vue
@@ -1,10 +1,20 @@
<template>
<view class="p15 bg-white">
<view class="search-container m-t-12 flex">
+ <view class="flex m-r-20">
+ <view class="m-r-10" style="line-height: 80rpx;" @click="changeType">
+ {{type=='flower'?'按鲜花':'按店铺'}}
+ </view>
+ <u-icon name="arrow-down"></u-icon>
+
+ </view>
<view class="flex1 input">
<u-input placeholder="请输入花名" v-model="search_flow" clearable @confirm="buttonSearchFlow" @clear="()=>{
$nextTick(()=>{buttonSearchFlow()})
}">
+ <!-- <u--text text="http://" slot="prefix" margin="0 3px 0 0" type="tips"></u--text> -->
+
+
<template slot="suffix">
<uni-icons color="#20613D" type="search" size="24" @click="buttonSearchFlow"></uni-icons>
</template>
@@ -12,7 +22,7 @@
</view>
</view>
- <view class="m-t-12">
+ <view class="m-t-20">
<view class="title flex">
<view class="m-l-0 m-r-a">搜索历史</view>
<view class="bg-white desc-gray text-center m-l-a m-r-0" @click.stop="clearHistory">
@@ -34,6 +44,7 @@
return {
search_flow: '',
history: [],
+ type: 'flower', //supplierName
}
},
onShow() {
@@ -44,6 +55,13 @@
this.$storage.setItem("cache_home_search", JSON.stringify(this.history))
},
methods: {
+ changeType() {
+ if (this.type == 'flower') {
+ this.type = 'supplier'
+ } else {
+ this.type = 'flower'
+ }
+ },
buttonSearchFlow() {
var name = this.search_flow
if (name) {
@@ -55,9 +73,15 @@
this.history.splice(this.history.length - 1, 1)
}
- console.log('buttonSearchFlow')
+ // console.log('buttonSearchFlow')
+ var p = ''
+ if (this.type === 'flower') {
+ p = 'name=' + this.search_flow
+ } else {
+ p = 'supplierName=' + this.search_flow
+ }
uni.navigateTo({
- url: '/sub_pages/customer/trade/list?name=' + this.search_flow
+ url: '/sub_pages/customer/trade/list?' + p
})
}
},
@@ -71,9 +95,14 @@
this.history.splice(this.history.indexOf(name), 1)
}
this.history.unshift(name)
-
+ var p = ''
+ if (this.type === 'flower') {
+ p = 'name=' + name
+ } else {
+ p = 'supplierName=' + name
+ }
uni.navigateTo({
- url: '/sub_pages/customer/trade/list?name=' + name
+ url: '/sub_pages/customer/trade/list?' + p
})
}
}
diff --git a/pages/home/components/home-zones.vue b/pages/home/components/home-zones.vue
index 7b2c3f6..c375985 100644
--- a/pages/home/components/home-zones.vue
+++ b/pages/home/components/home-zones.vue
@@ -4,7 +4,7 @@
<image class="p1 img100 m-t-12" :lazy-load="true" mode="aspectFill"
:src="item.bgUrl">
</image>
- <view class="c-txt-1">
+ <view class="c-txt-1" v-show="false">
<view class="title">{{ item.name }}</view>
<view class="flex">
<view class="desc">查看详情</view>
diff --git a/pages/home/home.vue b/pages/home/home.vue
index e875b9f..21a16f3 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -21,7 +21,7 @@
</view>
<view class="search-container m-t-12 flex" @click="goto('/pages/home/components/home-search',false)">
<view class="flex1 input">
- <u-input placeholder="请输入花名" disabled v-model="search_flow">
+ <u-input placeholder="请输入花名或店铺名" disabled v-model="search_flow">
<template slot="suffix">
<!-- @click="buttonSearchFlow" -->
<uni-icons color="#20613D" type="search" size="24"></uni-icons>
@@ -37,7 +37,8 @@
v-if="banners&&banners.length>0" :autoplay="true">
<swiper-item v-for="(item, index) in banners" :key="index">
<view class="swiper-item" :class="'swiper-item' + index">
- <image @click="previewImg(item.url||item.image)" class="home-banner-image" mode="scaleToFill"
+ <!-- @click="previewImg(item.url||item.image)" -->
+ <image class="home-banner-image" mode="scaleToFill" @click="clickBanner(item)"
:src="item.url||item.image">
</image>
</view>
@@ -166,8 +167,9 @@
};
},
onShareAppMessage() {
- let that = this;
- var name = that.currentInfo.customerDTO&&that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO&&that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO&&that.currentInfo.partnerDTO.name || ''
+ let that = this;
+ var name = that.currentInfo.customerDTO && that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&
+ that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && that.currentInfo.partnerDTO.name || ''
var url =
`/pages/home/home?shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
return {
@@ -176,13 +178,14 @@
}
},
onShareTimeline() {
- let that = this;
- var name = that.currentInfo.customerDTO&&that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO&&that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO&&that.currentInfo.partnerDTO.name || ''
- var url =
- `/pages/home/home?shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
- return {
- title: "花满芫",
- path: url,
+ let that = this;
+ var name = that.currentInfo.customerDTO && that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&
+ that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && that.currentInfo.partnerDTO.name || ''
+ var url =
+ `/pages/home/home?shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
+ return {
+ title: "花满芫",
+ path: url,
}
},
@@ -210,21 +213,35 @@
//获取banner图
this.$http.request('get', '/api/pub/banner/list', {}).then(res => {
if (res.code == 0) {
- this.banners = res.data || []
- if (this.banners.length == 0) {
- this.banners.push({
- url: 'https://hmy-flower.oss-cn-shanghai.aliyuncs.com/62/62ddac6297104e369aba646be704064dbanner@2x.png'
- })
+ this.banners = []
+
+ var tarr = res.data || []
+ if (tarr.length == 0) {
+ // tarr.push({
+ // url: 'https://hmy-flower.oss-cn-shanghai.aliyuncs.com/62/62ddac6297104e369aba646be704064dbanner@2x.png'
+ // })
+ this.banners = tarr
} else {
- for (var item of this.banners) {
+ var result = []
+ for (var item of tarr) {
// http://106.14.123.210/files/group1/e8/e1c17f7229514e5da211d8d47b09906b.jpeg
try {
if (item.url) {
var t = JSON.parse(item.url)
if (Array.isArray(t)) {
- item.url = t[0] || ''
+ // item.url = t[0] || ''
+ for (var url of t) {
+ result.push({
+ ...item,
+ url: url || ''
+ })
+ }
} else {
- item.url = t.url || ''
+ // item.url = t.url || ''
+ result.push({
+ ...item,
+ url: t.url || ''
+ })
}
}
@@ -232,7 +249,9 @@
// console.log('error',e)
}
}
- }
+ this.banners = result
+ }
+ console.log('this.banners',this.banners)
}
})
@@ -302,6 +321,15 @@
},
methods: {
+ clickBanner(item) {
+ if (item.id) {
+ uni.navigateTo({
+ url: '/pages/home/components/home-banner-detail?id=' + item.id
+ })
+ } else if (item.url) {
+ this.previewImg(item.url)
+ }
+ },
goToAddress() {
if (!this.currentInfo.id) {
this.$message.showToast('请先前往登录')
diff --git a/pages/order/order.vue b/pages/order/order.vue
index 96bc190..8972272 100644
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -182,7 +182,7 @@
}
}
break
- case 'delOrder':{
+ case 'delOrder': {
await this.$message.confirm('是否删除此订单')
// 发送请求
this.$message.showLoading()
@@ -248,6 +248,7 @@
</view>
<view class="value">{{ dto.deliveryNo }}</view>
</view>
+
<view class="flex">
<view class="desc flex flex1">
<view class="label">
@@ -262,12 +263,21 @@
<view class="value">{{ dto.customerTel || '-' }}</view>
</view>
</view>
- <view class="desc flex">
- <view class="label">
- 收货地址:
+ <view class="flex">
+ <view class="desc flex flex1">
+ <view class="label">
+ 收货地址:
+ </view>
+ <view class="value">{{ dto.customerAddress }}</view>
</view>
- <view class="value">{{ dto.customerAddress }}</view>
+ <view class="desc flex flex1" v-if="dto.deliveryName">
+ <view class="label">
+ 快递名称:
+ </view>
+ <view class="value">{{ dto.deliveryName }}</view>
+ </view>
</view>
+
<view class="desc flex" v-if="dto.statusBackend!=='PENDING'&&dto.statusBackend!=='CANCEL'">
<view class="label">
支付时间:
diff --git a/pages/user/supplier-user.vue b/pages/user/supplier-user.vue
index 1f27ba8..7fd4739 100644
--- a/pages/user/supplier-user.vue
+++ b/pages/user/supplier-user.vue
@@ -173,7 +173,8 @@
</view>
</view>
<!-- #ifdef PUB_PARTNER -->
- <view class="user-util m-t-12 flex" v-if="selftype==='partner'"
+ <view class="user-util m-t-12 flex"
+ v-if="selftype==='partner'&¤tInfo.partnerDTO&¤tInfo.partnerDTO.id&¤tInfo.partnerDTO.status=='P'"
@click="goto('/sub_pages/partner/partner-info/partner-code',true)">
<view class="title">推广的注册二维码</view>
<view class="right-icon">
@@ -364,7 +365,8 @@
// #ifdef PUB_CUSTOMER
onShareAppMessage() {
let that = this;
- var name = that.currentInfo.customerDTO&&that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO&&that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO&&that.currentInfo.partnerDTO.name || ''
+ var name = that.currentInfo.customerDTO && that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&
+ that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && that.currentInfo.partnerDTO.name || ''
var url =
`/pages/home/home?shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
return {
@@ -374,8 +376,8 @@
},
onShareTimeline() {
let that = this;
- var name = that.currentInfo.customerDTO && that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&
- that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && that.currentInfo.partnerDTO.name || ''
+ var name = that.currentInfo.customerDTO && that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&
+ that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && that.currentInfo.partnerDTO.name || ''
var url =
`/pages/home/home?shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
return {
diff --git a/pages/user/user-bind-wx/user-bind-wx.vue b/pages/user/user-bind-wx/user-bind-wx.vue
index 20e5c2c..84da338 100644
--- a/pages/user/user-bind-wx/user-bind-wx.vue
+++ b/pages/user/user-bind-wx/user-bind-wx.vue
@@ -30,7 +30,10 @@
</view>
<view class="t-red">*提醒:未实名或者真实姓名与微信支付实名不一样，可能会导致转账失败</view>
-
+ <view class="t-red m-t-20"
+ v-if="currentInfo.partnerDTO&¤tInfo.partnerDTO.realName||currentInfo.supplierDTO&¤tInfo.supplierDTO.realName">
+ *已实名:{{currentInfo.partnerDTO && currentInfo.partnerDTO.realName ||currentInfo.supplierDTO && currentInfo.supplierDTO.realName || '-'}}
+ </view>
<!-- <button @click="getUserProfile" open-type="getUserInfo" class="bottom-button">绑定当前微信</button> -->
<button @click="wxlogin" open-type="getUserInfo" class="bottom-button">绑定当前微信</button>
diff --git a/plugins/http.js b/plugins/http.js
index e2b5096..4606465 100644
--- a/plugins/http.js
+++ b/plugins/http.js
@@ -134,7 +134,7 @@
// store.dispatch('/clearUserInfo')
// commit('updat')
// store.commit('updateLogin', false)
- console.log('401',res)
+ console.log('401', res)
message.showToast('登录信息失效')
storage.removeItem('token')
reject({
@@ -160,6 +160,13 @@
code: 403,
msg: 'Forbidden'
})
+ } else if (res.statusCode === 429) {
+ message.showToast('系统操作太频繁，请稍后再试！')
+ reject({
+ data: null,
+ code: 429,
+ msg: 'Forbidden'
+ })
} else if (res.statusCode === 404) {
message.showToast('api不存在')
reject({
diff --git a/store/index.js b/store/index.js
index a12972b..7d00f52 100644
--- a/store/index.js
+++ b/store/index.js
@@ -30,7 +30,8 @@
'shopping': 0,
'follow': 0,
'delivery': 0,
- 'order': 0
+ 'order': 0,
+ 'shopnum': 0
},
defaultaddress: {}
},
diff --git a/sub_pages/customer/shop/shop.vue b/sub_pages/customer/shop/shop.vue
index c7f1e1d..2318028 100644
--- a/sub_pages/customer/shop/shop.vue
+++ b/sub_pages/customer/shop/shop.vue
@@ -157,6 +157,10 @@
<view class="label">身份认证</view>
<view class="value">{{dto.idcardTypeStr||'未认证'}}</view>
</view>
+ <!-- <view class="form-input flex">
+ <view class="label"> </view>
+ <view class="value">{{'已实名'}}</view>
+ </view> -->
</view>
</view>
@@ -208,7 +212,8 @@
// #ifdef PUB_CUSTOMER
onShareAppMessage() {
let that = this;
- var name = that.currentInfo.customerDTO&&that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO&&that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO&&that.currentInfo.partnerDTO.name || ''
+ var name = that.currentInfo.customerDTO && that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&
+ that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && that.currentInfo.partnerDTO.name || ''
var url =
`/sub_pages/customer/shop/shop?id=${this.id}&shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
return {
@@ -218,7 +223,8 @@
},
onShareTimeline() {
let that = this;
- var name = that.currentInfo.customerDTO&&that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO&&that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO&&that.currentInfo.partnerDTO.name || ''
+ var name = that.currentInfo.customerDTO && that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&
+ that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && that.currentInfo.partnerDTO.name || ''
var url =
`/sub_pages/customer/shop/shop?id=${this.id}&shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
return {
diff --git a/sub_pages/customer/shopping/shopping.vue b/sub_pages/customer/shopping/shopping.vue
index 825b175..015667c 100644
--- a/sub_pages/customer/shopping/shopping.vue
+++ b/sub_pages/customer/shopping/shopping.vue
@@ -357,6 +357,7 @@
await this.clickSwipeButton(dto, false)
// await this.init()
}
+ this.$store.dispatch('sign_add', 'shopnum');
this.$forceUpdate()
}
},
diff --git a/sub_pages/customer/trade/list.vue b/sub_pages/customer/trade/list.vue
index f162d51..929a99a 100644
--- a/sub_pages/customer/trade/list.vue
+++ b/sub_pages/customer/trade/list.vue
@@ -216,7 +216,8 @@
levelStr: '',
level: '',
column: '',
- params: [],
+ params: [],
+ supplierName:'',
columnStr: '',
},
categoryInfo: {},
@@ -241,7 +242,7 @@
var name = that.currentInfo.customerDTO && that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&
that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && that.currentInfo.partnerDTO.name || ''
var url =
- `/sub_pages/customer/trade/list?categoryId=${this.query.category}&zoneId=${this.query.zoneId}&name=${this.query.name}&shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
+ `/sub_pages/customer/trade/list?categoryId=${this.query.category}&zoneId=${this.query.zoneId}&name=${this.query.name}&supplierName=${this.query.supplierName}&shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
return {
title: "花满芫-商品列表",
path: url,
@@ -252,7 +253,7 @@
var name = that.currentInfo.customerDTO && that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&
that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && that.currentInfo.partnerDTO.name || ''
var url =
- `/sub_pages/customer/trade/list?categoryId=${this.query.category}&zoneId=${this.query.zoneId}&name=${this.query.name}&shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
+ `/sub_pages/customer/trade/list?categoryId=${this.query.category}&zoneId=${this.query.zoneId}&name=${this.query.name}&supplierName=${this.query.supplierName}&shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
return {
title: "花满芫-商品列表",
path: url,
@@ -264,11 +265,19 @@
console.log('options', options)
this.query.category = options.categoryId || options.category || ''
this.query.zoneId = options.zoneId || ''
- this.query.name = options.name || ''
+ this.query.name = options.name || ''
+ this.query.supplierName = options.supplierName || ''
+
+
if (this.query.name) {
uni.setNavigationBarTitle({
title: '商品列表-' + this.query.name
})
+ }
+ if (this.query.supplierName) {
+ uni.setNavigationBarTitle({
+ title: '商品列表-' + this.query.supplierName
+ })
}
this.listApi = '/api/customer/flower/list'
this.getList('post')
diff --git a/sub_pages/supplier/print/print-list.vue b/sub_pages/supplier/print/print-list.vue
index af0d710..e544fba 100644
--- a/sub_pages/supplier/print/print-list.vue
+++ b/sub_pages/supplier/print/print-list.vue
@@ -526,20 +526,28 @@
}
command.setText(30, 40, "TSS24.BF2", 1, 1, "" + (that.item.supplierName || '-'))
command.setText(200, 40, "TSS24.BF2", 1, 1, "" + (that.item.warehouseName || '待分配'))
-
- command.setText(30, 80, "TSS24.BF2", 1, 1, "" + (that.item.flowerCategory || ''))
+ var flowerCategory = that.item.flowerCategory
+ if (flowerCategory) {
+ //只取二级分类
+ var tarr = flowerCategory.splite("/")
+ if (tarr.length >= 2) {
+ flowerCategory = tarr[tarr.length - 1]
+ }
+ }
+ command.setText(30, 80, "TSS24.BF2", 1, 1, "" + (flowerCategory || ''))
command.setText(200, 80, "TSS24.BF2", 1, 1, "库位:" + (that.item.warehouseLocationCode || ''))
command.setText(30, 120, "TSS24.BF2", 1, 1, "等级:" + (that.item.flowerLevelStr || ''))
command.setText(200, 120, "TSS24.BF2", 1, 1, "" + (that.item.flowerColor || ''))
-
- command.setText(30, 160, "TSS24.BF2", 1, 1, "规格: " + (that.item.flowerUnit || '-'))
- command.setText(200, 160, "TSS24.BF2", 1, 1, "成熟度: " + (paramsmap['成熟度'] || '-'))
-
- command.setText(30, 200, "TSS24.BF2", 1, 1, "枝长: " + (paramsmap['枝长'] || '-'))
+ // 规格:
+ command.setText(30, 160, "TSS24.BF2", 1, 1, "" + (that.item.flowerUnit || '-'))
+ // 成熟度:
+ command.setText(200, 160, "TSS24.BF2", 1, 1, "" + (paramsmap['成熟度'] || '-'))
+ // 枝长:
+ command.setText(30, 200, "TSS24.BF2", 1, 1, "" + (paramsmap['枝长'] || '-'))
command.setText(200, 200, "TSS24.BF2", 1, 1, that.$util.toDate(new Date()))
- command.setText(100, 230, "TSS24.BF2", 1, 1, "————————————")
+ command.setText(60, 230, "TSS24.BF2", 1, 1, "————————————")
command.setText(30, 260, "TSS24.BF2", 1, 1, "花满芫")
command.setText(200, 260, "TSS24.BF2", 1, 1, `数目: ${i+1}/${that.item.num}`)
@@ -805,6 +813,7 @@
font-size: 28rpx;
color: #000000;
line-height: 40rpx;
+
.level {
font-weight: 400;
font-size: 28rpx;
@@ -841,6 +850,7 @@
font-size: 28rpx;
color: #000000;
line-height: 40rpx;
+
.level {
font-weight: 400;
font-size: 28rpx;
--
Gitblit v1.9.3