sileya-ai
/
vr-shopxo-uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-sws' into dev

master
gongfuxiang 2023-11-01 19:06:53 +08:00
parent b93b9ee42b ac6720f6b5
commit ded6e7f833
4 changed files with 59 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
components/payment/payment.vue
View File

@ -148,6 +148,11 @@
type: Boolean,
default: false,
},
// 判断错误时是否需要弹窗提示
propIsFailAlert: {
type: Boolean,
default: true,
},
},
components: {
componentPopup,
@ -609,19 +614,26 @@
to_fail_page_event(msg) {
let to_fail_page = this.propToFailPage;
if (to_fail_page) {
// 现金支付
uni.showModal({
content: msg,
showCancel: false,
success(res) {
if (res.confirm) {
// 跳转支付页面
uni.redirectTo({
url: to_fail_page,
});
}
},
});
if (this.propIsFailAlert) {
// 现金支付
uni.showModal({
content: msg,
showCancel: false,
success(res) {
if (res.confirm) {
// 跳转支付页面
uni.redirectTo({
url: to_fail_page,
});
}
},
});
} else {
// 跳转支付页面
uni.redirectTo({
url: to_fail_page,
});
}
} else {
if (msg) {
app.globalData.showToast(msg);

8
pages/index/index.vue
View File

@ -24,11 +24,9 @@
<view v-if="common_app_is_enable_search == 1" class="search-content-input dis-inline-block va-m" :style="top_content_search_style">
<!-- 是否开启搜索框前面icon扫一扫 -->
<block v-if="is_home_search_scan == 1">
<component-search propPlaceholder="输入商品名称搜索" propPlaceholderClass="cr-white" propIconColor="#fff" propBgColor="rgb(255 255 255 / 0.5)" <!-- #ifndef H5 -->
@onicon="search_icon_event" propIcon="icon-mendian-sousuosm" :propIsIconOnEvent="true"
<!-- #endif -->
></component-search
>
<!-- #ifndef H5 -->
<component-search propPlaceholder="输入商品名称搜索" propPlaceholderClass="cr-white" propIconColor="#fff" propBgColor="rgb(255 255 255 / 0.5)" @onicon="search_icon_event" propIcon="icon-mendian-sousuosm" :propIsIconOnEvent="true"></component-search>
<!-- #endif -->
</block>
<block v-else>
<component-search propPlaceholder="输入商品名称搜索" propPlaceholderClass="cr-white" propIconColor="#fff" propBgColor="rgb(255 255 255 / 0.5)"></component-search>

10
pages/plugins/scanpay/index/index.css
View File

@ -68,12 +68,16 @@
font-weight: 400;
}
.sub-key-content text {
.sub-key-content .key-num {
transition: all 0.15s ease-in-out;
}
.sub-key-content text:active {
background-color: rgba(0, 0, 0, 0.15);
.sub-key-content .key-num:active {
background-color: rgba(0, 0, 0, 0.1) !important;
}
.sub-key-content .key-num.sub:active {
background-color: rgba(230, 67, 64, 0.85) !important;
}
/* 弹框 */

47
pages/plugins/scanpay/index/index.vue
View File

@ -68,35 +68,35 @@
</view>
<view class="bg-white tc text-size-xl fw-b sub-key-content">
<view class="flex-row">
<text class="flex-1 key-1 br-r-f5 br-b-f5" @tap="key_up_event('1')">1</text>
<text class="flex-1 key-1 br-r-f5 br-b-f5" @tap="key_up_event('2')">2</text>
<text class="flex-1 key-1 br-r-f5 br-b-f5" @tap="key_up_event('3')">3</text>
<text class="flex-1 key-1 br-b-f5" @tap="key_up_event('del')">
<iconfont name="icon-keyboard-backspace" size="68rpx" class="fw-n"></iconfont>
</text>
<view class="flex-1 key-1 br-r-f5 br-b-f5 key-num" @tap="key_up_event('1')">1</view>
<view class="flex-1 key-1 br-r-f5 br-b-f5 key-num" @tap="key_up_event('2')">2</view>
<view class="flex-1 key-1 br-r-f5 br-b-f5 key-num" @tap="key_up_event('3')">3</view>
<view class="flex-1 key-1 br-b-f5 key-num" @tap="key_up_event('del')">
<iconfont name="icon-keyboard-backspace" color="#333" size="68rpx" class="fw-n"></iconfont>
</view>
</view>
<view class="flex-row">
<view class="flex-3">
<view class="flex-row">
<text class="flex-1 key-1 br-r-f5 br-b-f5" @tap="key_up_event('4')">4</text>
<text class="flex-1 key-1 br-r-f5 br-b-f5" @tap="key_up_event('5')">5</text>
<text class="flex-1 key-1 br-r-f5 br-b-f5" @tap="key_up_event('6')">6</text>
<view class="flex-1 key-1 br-r-f5 br-b-f5 key-num" @tap="key_up_event('4')">4</view>
<view class="flex-1 key-1 br-r-f5 br-b-f5 key-num" @tap="key_up_event('5')">5</view>
<view class="flex-1 key-1 br-r-f5 br-b-f5 key-num" @tap="key_up_event('6')">6</view>
</view>
<view class="flex-row">
<text class="flex-1 key-1 br-r-f5 br-b-f5" @tap="key_up_event('7')">7</text>
<text class="flex-1 key-1 br-r-f5 br-b-f5" @tap="key_up_event('8')">8</text>
<text class="flex-1 key-1 br-r-f5 br-b-f5" @tap="key_up_event('9')">9</text>
<view class="flex-1 key-1 br-r-f5 br-b-f5 key-num" @tap="key_up_event('7')">7</view>
<view class="flex-1 key-1 br-r-f5 br-b-f5 key-num" @tap="key_up_event('8')">8</view>
<view class="flex-1 key-1 br-r-f5 br-b-f5 key-num" @tap="key_up_event('9')">9</view>
</view>
<view class="flex-row">
<text class="flex-2 key-1 br-r-f5" @tap="key_up_event('0')">0</text>
<text class="flex-1 key-1 repair br-r-f5" @tap="key_up_event('.')">.</text>
<view class="flex-2 key-1 br-r-f5 key-num" @tap="key_up_event('0')">0</view>
<view class="flex-1 key-1 repair br-r-f5 key-num" @tap="key_up_event('.')">.</view>
</view>
</view>
<view class="flex-1 bg-red cr-white key-num sub" @tap="key_up_event('sub')">
<view class="flex-col jc-c ht-auto">
<view class="fw-n">支付</view>
</view>
</view>
<text class="flex-1 bg-red cr-white" @tap="key_up_event('sub')">
<text class="flex-col jc-c ht-auto">
<text class="fw-n">支付</text>
</text>
</text>
</view>
</view>
</view>
@ -110,6 +110,7 @@
:prop-pay-price="pay_price"
:prop-payment-id="payment_id"
:propIsRedirectTo="true"
:propIsFailAlert="false"
:propToPage="to_page"
:propToFailPage="to_fail_page"
:prop-to-appoint-page="to_appoint_page"
@ -219,7 +220,7 @@
if (res.data.code == 0) {
var new_form = this.form;
var data = res.data.data || null;
if(data != null) {
if (data != null) {
new_form.payment_id = data.payment_list[0].id;
}
this.setData({
@ -230,9 +231,9 @@
});
// 标题
if(data != null && (data.scanpay_info || null) != null) {
if (data != null && (data.scanpay_info || null) != null) {
uni.setNavigationBarTitle({
title: data.scanpay_info.name+'收款'
title: data.scanpay_info.name + '收款',
});
}
} else {
@ -335,7 +336,7 @@
this.concat_string(price + v);
}
}
// 触感振动
uni.vibrateShort();
},