From 79bab5631b0ef473fd63be5a5cef200773a08da7 Mon Sep 17 00:00:00 2001
From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com>
Date: Sat, 2 Mar 2024 17:31:12 +0800
Subject: [PATCH] 1
---
pages.json | 2 +-
.../small_classification/index.vue | 11 ++-
pages/payment/get_payment.vue | 95 ++++++++++---------
3 files changed, 59 insertions(+), 49 deletions(-)
diff --git a/pages.json b/pages.json
index 8acc6a5..241c998 100644
--- a/pages.json
+++ b/pages.json
@@ -112,7 +112,7 @@
{
"path": "pages/payment/get_payment",
"style": {
- "navigationBarTitleText": "面对面收款",
+ "navigationBarTitleText": "提货付款",
"navigationStyle": "custom"
}
},
diff --git a/pages/cloud_warehouse/small_classification/index.vue b/pages/cloud_warehouse/small_classification/index.vue
index 341fcad..59758ef 100644
--- a/pages/cloud_warehouse/small_classification/index.vue
+++ b/pages/cloud_warehouse/small_classification/index.vue
@@ -40,8 +40,8 @@
+ :class="{'active':storeParam.deduction_rate == item.value}"
+ @click="handleChooseProp(item.value)">
{{item.label_name}}
@@ -66,7 +66,7 @@
- 1
+
{{item.product.store_name}}
{{item.product.store_info}}
@@ -527,6 +527,11 @@
mer_id: ENV == 'prod' ? '259' : '244'
}).then(res => {
this.propotionData = res.data;
+ this.propotionData.unshift({
+ product_label_id: '',
+ value: '',
+ label_name: '全部'
+ })
})
},
diff --git a/pages/payment/get_payment.vue b/pages/payment/get_payment.vue
index 384307f..c2e0ae3 100644
--- a/pages/payment/get_payment.vue
+++ b/pages/payment/get_payment.vue
@@ -1,14 +1,14 @@
-
-
-
-
+
+
+
+
- 付款给商家
+ 确认提货付款
{{merchantInfo.merchant.mer_name}}
付款金额
￥
-
+
@@ -51,7 +52,8 @@
{{tips}}
-
+
@@ -63,7 +65,7 @@
addCart,
orderCheck
} from "@/api/payment.js";
- import Cache from '@/utils/cache';
+ import Cache from '@/utils/cache';
import {
mapGetters
} from "vuex";
@@ -101,34 +103,39 @@
isAuto: false, //没有授权的不会自动授权
isShowAuth: false, //是否隐藏授权
mer_id: '',
- tips: '暂未登陆~'
+ tips: '暂未登陆~'
}
},
onLoad(opt) {
this.mer_id = opt.mer_id;
},
- onShow() {
- if (!this.isLogin) {
- Cache.set("login_back_url_weixin", "/" + getCurrentPages()[0].route + "?mer_id=" + this.mer_id);
- this.isAuto = true;
- this.isShowAuth = true;
- } else {
- this.getProductInfoByMerid(this.mer_id);
- }
- },
+ onShow() {
+ if (!this.isLogin) {
+ Cache.set("login_back_url_weixin", "/" + getCurrentPages()[0].route + "?mer_id=" + this.mer_id);
+ this.isAuto = true;
+ this.isShowAuth = true;
+ } else {
+ this.getProductInfoByMerid(this.mer_id);
+ }
+ },
methods: {
- leftClick(e){
- uni.switchTab({
- url: '/pages/index/index'
- })
- },
+ validateDecimal(event) {
+ console.log(event);
+ this.checkForm.total_amount = event.match(/^\d*(\.?\d{0,2})/g)[0]
+ },
+
+ leftClick(e) {
+ uni.switchTab({
+ url: '/pages/index/index'
+ })
+ },
// 授权关闭
authColse: function(e) {
this.isShowAuth = e;
},
onLoadFun() {
- this.getProductInfoByMerid(this.mer_id);
+ this.getProductInfoByMerid(this.mer_id);
this.isShowAuth = false;
},
@@ -173,16 +180,16 @@
}).then(res => {
this.merchantInfo = res.data;
}).catch((err) => {
- this.tips = err.message || err.smg || err;
- this.$util.Tips({
- title: err.message || err.msg || err
- })
+ this.tips = err.message || err.smg || err;
+ this.$util.Tips({
+ title: err.message || err.msg || err
+ })
// #ifdef APP
- setTimeout(()=>{
- uni.navigateBack({
- delta: 1
- })
- }, 1500)
+ setTimeout(() => {
+ uni.navigateBack({
+ delta: 1
+ })
+ }, 1500)
// #endif
// #ifndef APP
@@ -324,7 +331,9 @@
}
.v-wrap {
- position: relative;
+ display: flex;
+ align-items: center;
+ padding-left: 20rpx;
width: 666rpx;
height: 210rpx;
background-image: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/def/2f9c2202402291652415355.webp");
@@ -332,28 +341,24 @@
background-repeat: no-repeat;
.v-wrap-money {
- position: absolute;
- top: 70rpx;
- left: 36rpx;
+ display: flex;
+ align-items: center;
color: #FF5E0C;
+ margin-right: 30rpx;
.icon {
- font-size: 28rpx;
+ font-size: 34rpx;
}
.num {
font-size: 46rpx;
display: inline-block;
overflow: auto;
- width: 160rpx;
+ width: 180rpx;
}
}
.v-wrap-desc {
- position: absolute;
- top: 67rpx;
- left: 230rpx;
-
.v-wrap-desc-main {
margin-bottom: 16rpx;
font-weight: 600;