mkm/nk-shop2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'new' of https://gitea.lihaink.cn/mkm/nk-shop2.0 into new

Browse Source
This commit is contained in:
weipengfei 2024-03-02 17:32:32 +08:00
commit 280435d80f
3 changed files with 59 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pages.json
View File

@ -112,7 +112,7 @@
{ {
"path": "pages/payment/get_payment", "path": "pages/payment/get_payment",
"style": { "style": {
"navigationBarTitleText": "面对面收款", "navigationBarTitleText": "提货付款",
"navigationStyle": "custom" "navigationStyle": "custom"
} }
}, },

11
pages/cloud_warehouse/small_classification/index.vue
View File

@ -40,8 +40,8 @@
<image src="../../../static/cloud_warehouse/dkbl.png" /> <image src="../../../static/cloud_warehouse/dkbl.png" />
<block v-for="(item,indx) in propotionData" :key="indx"> <block v-for="(item,indx) in propotionData" :key="indx">
<view class="con-right-proportion-item" <view class="con-right-proportion-item"
:class="{'active':storeParam.deduction_rate == item.product_label_id}" :class="{'active':storeParam.deduction_rate == item.value}"
@click="handleChooseProp(item.product_label_id)"> @click="handleChooseProp(item.value)">
{{item.label_name}} {{item.label_name}}
</view> </view>
</block> </block>
@ -66,7 +66,7 @@
<u-loading-icon color="#999"></u-loading-icon> <u-loading-icon color="#999"></u-loading-icon>
</template> </template>
</u-image> </u-image>
<view class="short_item_right">1 <view class="short_item_right">
<view class="r_name">{{item.product.store_name}}</view> <view class="r_name">{{item.product.store_name}}</view>
<view class="r_type"> <view class="r_type">
<view v-if="item.product.store_info">{{item.product.store_info}}</view> <view v-if="item.product.store_info">{{item.product.store_info}}</view>
@ -527,6 +527,11 @@
mer_id: ENV == 'prod' ? '259' : '244' mer_id: ENV == 'prod' ? '259' : '244'
}).then(res => { }).then(res => {
this.propotionData = res.data; this.propotionData = res.data;
this.propotionData.unshift({
product_label_id: '',
value: '',
label_name: '全部'
})
}) })
}, },

95
pages/payment/get_payment.vue
View File

@ -1,14 +1,14 @@
<template> <template>
<view class="container"> <view class="container">
<view class="v-navbar"> <view class="v-navbar">
<u-navbar title="面对面收款" :safeAreaInsetTop="false" :fixed="false" @leftClick="leftClick" bgColor="transparent" <u-navbar title="提货付款" :safeAreaInsetTop="false" :fixed="false" @leftClick="leftClick" bgColor="transparent"
leftIconColor="#fff" :titleStyle="{color:'#fff',fontWeight:'bold',fontSize:'32rpx'}"> leftIconColor="#fff" :titleStyle="{color:'#fff',fontWeight:'bold',fontSize:'32rpx'}">
</u-navbar> </u-navbar>
</view> </view>
<view v-if="merchantInfo && !isEmpty"> <view v-if="merchantInfo && !isEmpty">
<view class="v-desc"> <view class="v-desc">
<view> <view>
<view class="v-desc-main">付款给商家</view> <view class="v-desc-main">确认提货付款</view>
<view class="v-desc-sub">{{merchantInfo.merchant.mer_name}}</view> <view class="v-desc-sub">{{merchantInfo.merchant.mer_name}}</view>
</view> </view>
<u-image :showLoading="true" :src="merchantInfo.merchant.mer_avatar" width="182rpx" height="182rpx" <u-image :showLoading="true" :src="merchantInfo.merchant.mer_avatar" width="182rpx" height="182rpx"
@ -20,8 +20,9 @@
<view class="v-con-text">付款金额</view> <view class="v-con-text">付款金额</view>
<view class="v-con-input" style="margin-right: 10px;"> <view class="v-con-input" style="margin-right: 10px;">
<text style="color: #303133;font-size:46rpx;">￥</text> <text style="color: #303133;font-size:46rpx;">￥</text>
<u--input type="digit" maxlength="5" fontSize="23" v-model="cartForm.total_amount" <u--input type="digit" maxlength="7" fontSize="23" v-model="cartForm.total_amount"
placeholder="请输入金额" border="none" placeholderStyle="color:#999;font-size:30rpx"> placeholder="请输入金额" border="none" placeholderStyle="color:#999;font-size:30rpx"
@input="validateDecimal">
</u--input> </u--input>
</view> </view>
@ -51,7 +52,8 @@
<image src="/static/images/no_thing.png"></image> <image src="/static/images/no_thing.png"></image>
<text style="margin-top: 60rpx;">{{tips}}</text> <text style="margin-top: 60rpx;">{{tips}}</text>
<!-- 登陆 --> <!-- 登陆 -->
<authorize :isAuto="isAuto" :isGoIndex="false" :isShowAuth="isShowAuth" @authColse="authColse" @onLoadFun="onLoadFun"> <authorize :isAuto="isAuto" :isGoIndex="false" :isShowAuth="isShowAuth" @authColse="authColse"
@onLoadFun="onLoadFun">
</authorize> </authorize>
</view> </view>
</view> </view>
@ -63,7 +65,7 @@
addCart, addCart,
orderCheck orderCheck
} from "@/api/payment.js"; } from "@/api/payment.js";
import Cache from '@/utils/cache'; import Cache from '@/utils/cache';
import { import {
mapGetters mapGetters
} from "vuex"; } from "vuex";
@ -101,34 +103,39 @@
isAuto: false, //没有授权的不会自动授权 isAuto: false, //没有授权的不会自动授权
isShowAuth: false, //是否隐藏授权 isShowAuth: false, //是否隐藏授权
mer_id: '', mer_id: '',
tips: '暂未登陆~' tips: '暂未登陆~'
} }
}, },
onLoad(opt) { onLoad(opt) {
this.mer_id = opt.mer_id; this.mer_id = opt.mer_id;
}, },
onShow() { onShow() {
if (!this.isLogin) { if (!this.isLogin) {
Cache.set("login_back_url_weixin", "/" + getCurrentPages()[0].route + "?mer_id=" + this.mer_id); Cache.set("login_back_url_weixin", "/" + getCurrentPages()[0].route + "?mer_id=" + this.mer_id);
this.isAuto = true; this.isAuto = true;
this.isShowAuth = true; this.isShowAuth = true;
} else { } else {
this.getProductInfoByMerid(this.mer_id); this.getProductInfoByMerid(this.mer_id);
} }
}, },
methods: { methods: {
leftClick(e){ validateDecimal(event) {
uni.switchTab({ console.log(event);
url: '/pages/index/index' this.checkForm.total_amount = event.match(/^\d*(\.?\d{0,2})/g)[0]
}) },
},
leftClick(e) {
uni.switchTab({
url: '/pages/index/index'
})
},
// 授权关闭 // 授权关闭
authColse: function(e) { authColse: function(e) {
this.isShowAuth = e; this.isShowAuth = e;
}, },
onLoadFun() { onLoadFun() {
this.getProductInfoByMerid(this.mer_id); this.getProductInfoByMerid(this.mer_id);
this.isShowAuth = false; this.isShowAuth = false;
}, },
@ -173,16 +180,16 @@
}).then(res => { }).then(res => {
this.merchantInfo = res.data; this.merchantInfo = res.data;
}).catch((err) => { }).catch((err) => {
this.tips = err.message || err.smg || err; this.tips = err.message || err.smg || err;
this.$util.Tips({ this.$util.Tips({
title: err.message || err.msg || err title: err.message || err.msg || err
}) })
// #ifdef APP // #ifdef APP
setTimeout(()=>{ setTimeout(() => {
uni.navigateBack({ uni.navigateBack({
delta: 1 delta: 1
}) })
}, 1500) }, 1500)
// #endif // #endif
// #ifndef APP // #ifndef APP
@ -324,7 +331,9 @@
} }
.v-wrap { .v-wrap {
position: relative; display: flex;
align-items: center;
padding-left: 20rpx;
width: 666rpx; width: 666rpx;
height: 210rpx; height: 210rpx;
background-image: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/def/2f9c2202402291652415355.webp"); background-image: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/def/2f9c2202402291652415355.webp");
@ -332,28 +341,24 @@
background-repeat: no-repeat; background-repeat: no-repeat;
.v-wrap-money { .v-wrap-money {
position: absolute; display: flex;
top: 70rpx; align-items: center;
left: 36rpx;
color: #FF5E0C; color: #FF5E0C;
margin-right: 30rpx;
.icon { .icon {
font-size: 28rpx; font-size: 34rpx;
} }
.num { .num {
font-size: 46rpx; font-size: 46rpx;
display: inline-block; display: inline-block;
overflow: auto; overflow: auto;
width: 160rpx; width: 180rpx;
} }
} }
.v-wrap-desc { .v-wrap-desc {
position: absolute;
top: 67rpx;
left: 230rpx;
.v-wrap-desc-main { .v-wrap-desc-main {
margin-bottom: 16rpx; margin-bottom: 16rpx;
font-weight: 600; font-weight: 600;