From c41e3faacd221543ea871520b0aa8f0e0fa680e5 Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Fri, 5 Jan 2024 19:02:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/shortPopup.vue | 35 ++++++++++++++++--- config/app.js | 4 +-- manifest.json | 4 +-- pages.json | 2 +- pages/admin/orderList/index.vue | 18 +++++++--- pages/index/index.vue | 17 +++++---- pages/moreProject/moreProject.vue | 18 +++++----- pages/nongKe/cloud_entrepot/indexOther.vue | 2 +- .../nongKe/supply_chain/shopping_trolley.vue | 4 +-- .../supply_chain/shopping_trolley_a.vue | 7 ++-- .../supply_chain/shopping_trolley_other.vue | 3 +- pages/users/order_list/indexOther.vue | 2 +- pages/users/supply_procurement/index.vue | 15 ++++---- 13 files changed, 87 insertions(+), 44 deletions(-) diff --git a/components/shortPopup.vue b/components/shortPopup.vue index 3ad1b1e..7937781 100644 --- a/components/shortPopup.vue +++ b/components/shortPopup.vue @@ -45,8 +45,11 @@ 购买数量 + + ({{once_min_count}}件起购) + - - + + @@ -56,7 +59,7 @@ - + 采购车 {{goodsNum}} @@ -106,6 +109,7 @@ cart_num: 1, //购买数量 goodsNum: 0, //购物车数量 current: 0, //轮播图当前滑块 + once_min_count: 1, //最少购买件数 }; }, mounted() { @@ -134,6 +138,10 @@ this.sku = res.data.sku||{}; this.sku_key_list = Object.keys(this.sku); this.attr = res.data.attr; + if(res.data.once_min_count>1){ + this.cart_num = res.data.once_min_count; + this.once_min_count = res.data.once_min_count; + } if(this.attr.length>0){ this.attr.forEach((item, index)=>{ this.changeAttr(index, 0); @@ -163,12 +171,24 @@ }) } }, + // 输入框失去焦点 + inputCartNumBlur(e){ + if(+e.detail.value < this.once_min_count){ + uni.showToast({ + icon: 'none', + title: `至少要买${this.once_min_count}件哦` + }) + this.$u.sleep(500).then(()=>{ + this.cart_num = this.once_min_count; + }) + } + }, // 减少购买数量 subCartNum() { - if (this.cart_num <= 1) { + if (this.cart_num <= this.once_min_count) { return uni.showToast({ icon: 'none', - title: '最少要买一件哦' + title: `最少要买${this.once_min_count}件哦` }) } this.cart_num--; @@ -217,6 +237,7 @@ // 加入购物车 addcart() { // return console.log(this.sku[this.changeSkuKey]); + if(this.cart_num - + 云商品 + {{ item.activity_type == 1 ? '秒杀' : item.activity_type == 2 ? '预售' : item.activity_type == 3 ? '助力' : item.activity_type == 4 ? '拼团' : item.activity_type == 10 ? '套餐' :'' }} - - 订单号：{{ item.order_sn }} - 下单时间：{{ item.create_time }} + + 订单号：{{ item.order_sn }} + 下单时间：{{ item.create_time }} {{item.refunding==1 ? '退款中' : item.refunding==2 ? '部分退款' : '全部退款'}} @@ -1028,4 +1029,13 @@ align-items: center; justify-content: center; } + .cloud-tag{ + font-size: 20rpx; + padding: 2rpx 5rpx; + font-weight: 400; + background-color: #ff4c3c; + border-radius: 8rpx; + margin-right: 6rpx; + color: #fff; + } \ No newline at end of file diff --git a/pages/index/index.vue b/pages/index/index.vue index de23967..23a1a5a 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -71,7 +71,7 @@ - 赊账订单 + 转账订单 @@ -94,7 +94,7 @@ 常用工具 - + @@ -367,12 +367,12 @@ --> - {{userInfoData.mer_info&&userInfoData.mer_info.is_company?"银行卡图片:":"开户凭证:"}} + {{userInfoData.mer_info&&userInfoData.mer_info.is_company?"开户凭证:":"银行卡图片:"}} - - + + @@ -914,7 +914,7 @@ import { Toast } from '../../libs/uniApi'; }); if (value.bank_front.length == 0) return that.$util.Tips({ - title: that.userInfoData.mer_info.is_company ? '请上传银行卡正面图片' : '请上传开户凭证' + title: that.userInfoData.mer_info.is_company ? '请上传开户凭证' : '请上传银行卡正面图片' }); // if (value.bank_back.length == 0) return that.$util.Tips({ @@ -1096,7 +1096,7 @@ import { Toast } from '../../libs/uniApi'; this.userInfoData = res.data; this.$store.commit('SET_USERINFO', res.data); this.merchantData.phone = res.data.phone; - if(res.data.mer_info.is_company==0) this.merchantData.company_name = ""; + if(res.data.mer_info.is_company==0) !this.merchantData.company_name ? this.merchantData.company_name = "" : null; else this.merchantData.company_name = res.data.mer_info.company_name; if (res.data.service == null) { // console.log('123'); @@ -1584,6 +1584,9 @@ import { Toast } from '../../libs/uniApi'; -webkit-align-items: center; align-items: center; padding-left: 2px; + input{ + flex: 1; + } } .acea-row.row-column { diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue index 31712c6..88b8d84 100644 --- a/pages/moreProject/moreProject.vue +++ b/pages/moreProject/moreProject.vue @@ -157,7 +157,7 @@ - 赊账订单 + 转账订单 @@ -208,12 +208,12 @@ 押金缴纳 - + 交易大厅 - + 委托销售 @@ -223,22 +223,22 @@ 委托订单 --> - + 发布管理 - + 供应链批发 - + 代发订单 - + 补货订单 @@ -561,7 +561,6 @@ import mTabbar from '@/components/m-tabbar/m-tabbar.vue' import emptyPage from '@/components/emptyPage.vue'; import zbpSwiper from '@/components/zbpSwiper' import { - mapGetters } from 'vuex' import { @@ -586,7 +585,7 @@ import { merchant, paymerchant } from '@/api/api.js' - +import { ENV } from "@/config/app.js" export default { components: { mTabbar, @@ -643,6 +642,7 @@ export default { onLoad () { this.Fheight = uni.getSystemInfoSync().windowHeight + 'px'; console.log(this.Fheight) + if(ENV!='prod') this.no_prod = true; }, onShow () { if (this.isLogin) { diff --git a/pages/nongKe/cloud_entrepot/indexOther.vue b/pages/nongKe/cloud_entrepot/indexOther.vue index d28977d..e5240ec 100644 --- a/pages/nongKe/cloud_entrepot/indexOther.vue +++ b/pages/nongKe/cloud_entrepot/indexOther.vue @@ -328,7 +328,7 @@ async onLoad(options) { // console.log(options); this.storeParam.sys_labels = options.value; - if(options.value==12)this.nav_title = '赊账进货' + if(options.value==12)this.nav_title = '线下支付' this.tips = options.tips; let userInfo = this.$store.state.app.userInfo; if(typeof userInfo == 'string') this.userInfoData = JSON.parse(userInfo); diff --git a/pages/nongKe/supply_chain/shopping_trolley.vue b/pages/nongKe/supply_chain/shopping_trolley.vue index f8cbf8e..83a2abc 100644 --- a/pages/nongKe/supply_chain/shopping_trolley.vue +++ b/pages/nongKe/supply_chain/shopping_trolley.vue @@ -7,8 +7,8 @@ 售后无忧 --> - 现款现货 - 赊账进货 + 线上付款 + 线下付款 线上铺货 线下铺货 diff --git a/pages/nongKe/supply_chain/shopping_trolley_a.vue b/pages/nongKe/supply_chain/shopping_trolley_a.vue index 6b867cd..285b464 100644 --- a/pages/nongKe/supply_chain/shopping_trolley_a.vue +++ b/pages/nongKe/supply_chain/shopping_trolley_a.vue @@ -48,8 +48,8 @@ - {{goods.product.once_min_count}}件起购，最多{{goods.product.once_max_count}}件 + {{goods.product.once_min_count}}件起购，最多{{goods.product.once_max_count}}件 ￥{{goods.productAttr.procure_price}} @@ -59,7 +59,7 @@ - - + - {{goods.cart_num}} + @@ -650,6 +650,7 @@ // 购物车递减 subCart(goods) { let status = false; + if (goods.cart_num <= goods.product.once_min_count) return Toast(`${goods.product.once_min_count}件起购哦`); if (goods.cart_num < 1) status = true; if (goods.cart_num <= 1) { goods.cart_num = 1; diff --git a/pages/nongKe/supply_chain/shopping_trolley_other.vue b/pages/nongKe/supply_chain/shopping_trolley_other.vue index afe4e34..04723c2 100644 --- a/pages/nongKe/supply_chain/shopping_trolley_other.vue +++ b/pages/nongKe/supply_chain/shopping_trolley_other.vue @@ -59,7 +59,7 @@ - - + - {{goods.cart_num}} + @@ -652,6 +652,7 @@ // 购物车递减 subCart(goods) { let status = false; + if (goods.cart_num <= goods.product.once_min_count) return Toast(`${goods.product.once_min_count}件起购哦`); if (goods.cart_num < 1) status = true; if (goods.cart_num <= 1) { goods.cart_num = 1; diff --git a/pages/users/order_list/indexOther.vue b/pages/users/order_list/indexOther.vue index 4fb0c33..26ccfe1 100644 --- a/pages/users/order_list/indexOther.vue +++ b/pages/users/order_list/indexOther.vue @@ -6,7 +6,7 @@ - 赊账订单信息 + 转账订单信息 总订单：{{orderData.orderCount || 0}} 总金额：￥{{orderData.orderPrice || 0}} diff --git a/pages/users/supply_procurement/index.vue b/pages/users/supply_procurement/index.vue index bb91618..42e63bc 100644 --- a/pages/users/supply_procurement/index.vue +++ b/pages/users/supply_procurement/index.vue @@ -21,11 +21,11 @@ + @click="navigator(`/pages/nongKe/cloud_entrepot/${item.name=='线上支付'?'indexb':'indexOther'}?type_id=12&value=${item.value}&tips=${item.content}`)">

{{item.name}}

- {{item.content}} + {{item.content}} @@ -61,14 +61,14 @@ item.content = '先售利润 后结货款'; item.icon = "https://lihai001.oss-cn-chengdu.aliyuncs.com/def/0c441202312251013392852.png"; } - if(item.name=='现款现货'){ + if(item.name=='线上支付'){ item.bg = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/f4521202312151148087081.png'; - item.content = '先付款 后发货'; + item.content = '手续费0.6%'; item.icon = "https://lihai001.oss-cn-chengdu.aliyuncs.com/def/0a377202312251014023667.png"; } - if(item.name=='赊账进货'){ + if(item.name=='线下支付'){ item.bg = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/899a4202312151148319478.png'; - item.content = '先发货 后付款'; + item.content = '手续费0'; item.icon = "https://lihai001.oss-cn-chengdu.aliyuncs.com/def/6a23e202312251014183019.png"; } }) @@ -121,8 +121,9 @@ top: 50%; transform: translateY(-50%); color: white; - view{ + .tips{ margin-top: 12rpx; + font-size: 26rpx; } } }