faiz
/
Huanyuyuehui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

This commit is contained in:
faiz 2024-06-24 11:38:28 +08:00
parent 20d994a8b0
commit 2972699741
11 changed files with 174 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
components/payment/index.vue
View File

@ -118,7 +118,40 @@
let that = this; let that = this;
let type = ''; let type = '';
that.show_integral=false; that.show_integral=false;
if (paytype == 'wechat') { // if (paytype == 'wechat') {
// // #ifdef H5
// type = this.$wechat.isWeixin() ? 'weixin' : 'h5';
// // #endif
// // #ifdef APP-PLUS
// type = 'weixin';
// // #endif
// // #ifdef MP
// type = 'routine';
// // #endif
// } else if (paytype == 'balance') {
// type = 'balance';
// }else if (paytype == 'integral') {
// type = 'integral';
// that.show_integral=true;
// }else if(paytype == 'alipay'){
// // #ifndef MP
// type = 'alipay';
// // #endif
// // #ifdef MP
// type = 'alipayQr';
// // #endif
// }else if(paytype == 'sand'){
// type = 'sand'
// }else if(paytype == 'sandCard'){
// type = 'sandCard'
// }else if(paytype == 'hf'){
// type = 'hf'
// }
switch (paytype){
case 'balance':
type = 'balance'
break;
case 'wechat':
// #ifdef H5 // #ifdef H5
type = this.$wechat.isWeixin() ? 'weixin' : 'h5'; type = this.$wechat.isWeixin() ? 'weixin' : 'h5';
// #endif // #endif
@ -128,22 +161,31 @@
// #ifdef MP // #ifdef MP
type = 'routine'; type = 'routine';
// #endif // #endif
} else if (paytype == 'balance') { break;
type = 'balance'; case 'integral':
}else if (paytype == 'integral') { type = 'integral'
type = 'integral';
that.show_integral=true; that.show_integral=true;
}else if(paytype == 'alipay'){ break;
case 'alipay':
// #ifndef MP // #ifndef MP
type = 'alipay'; type = 'alipay';
// #endif // #endif
// #ifdef MP // #ifdef MP
type = 'alipayQr'; type = 'alipayQr';
// #endif // #endif
}else if(paytype == 'sand'){ break;
case 'sand':
type = 'sand' type = 'sand'
}else if(paytype == 'sandCard'){ break;
case 'sandCard':
type = 'sandCard' type = 'sandCard'
break;
case 'hf':
type = 'hf'
break;
case 'sandQr':
type = 'sandQr'
break;
} }
if (!that.order_id) return that.$util.Tips({ if (!that.order_id) return that.$util.Tips({
title: '请选择要支付的订单' title: '请选择要支付的订单'
@ -381,6 +423,8 @@
break; break;
case 'sand': case 'sand':
case 'sandCard': case 'sandCard':
case 'hf':
case 'sandQr':
setTimeout(() => { setTimeout(() => {
location.href = jsConfig; location.href = jsConfig;
}, 100); }, 100);
@ -390,6 +434,8 @@
// #ifdef APP-PLUS // #ifdef APP-PLUS
case 'sand': case 'sand':
case 'sandCard': case 'sandCard':
case 'hf':
case 'sandQr':
console.log(jsConfig); console.log(jsConfig);
if (plus.os.name === 'iOS') { if (plus.os.name === 'iOS') {
plus.runtime.openURL(jsConfig); plus.runtime.openURL(jsConfig);

4
config/app.js
View File

@ -6,11 +6,11 @@ let VUE_APP_WS_URL = `ws://${location.hostname}?type=user`
let openPlantGrass = '-openPlantGrass-' let openPlantGrass = '-openPlantGrass-'
// 网络接口修改此字符 小程序域名要求https // 网络接口修改此字符 小程序域名要求https
// let httpApi = 'http://192.168.1.50:8080' //测试 // let httpApi = 'http://192.168.1.3:8080' //测试
let httpApi = 'https://api.tropjoin.com' //生产 let httpApi = 'https://api.tropjoin.com' //生产
// 聊天接口修改此字符 小程序聊天要求wss 例如：wss://mer. .net // 聊天接口修改此字符 小程序聊天要求wss 例如：wss://mer. .net
// let wsApi = 'ws://192.168.1.50:8080' // let wsApi = 'ws://192.168.1.3:8080'
let wsApi = 'wss://ws.tropjoin.com' let wsApi = 'wss://ws.tropjoin.com'
module.exports = { module.exports = {

4
manifest.json
View File

@ -2,8 +2,8 @@
"name" : "铸源优品", "name" : "铸源优品",
"appid" : "__UNI__496DF55", "appid" : "__UNI__496DF55",
"description" : "", "description" : "",
"versionName" : "1.0.6", "versionName" : "1.1.0",
"versionCode" : 133, "versionCode" : 137,
"transformPx" : false, "transformPx" : false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus" : { "app-plus" : {

6
pages.json
View File

@ -15,7 +15,7 @@
"path": "pages/index/index", "path": "pages/index/index",
"style": { "style": {
"navigationBarTitleText": "首页", "navigationBarTitleText": "首页",
// "navigationStyle": "custom", "navigationStyle": "custom",
// #ifdef APP-PLUS // #ifdef APP-PLUS
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
// #endif // #endif
@ -245,13 +245,13 @@
{ {
"path": "user_money/index", "path": "user_money/index",
"style": { "style": {
"navigationBarTitleText": "我的账户" "navigationBarTitleText": "我的抵扣券"
} }
}, },
{ {
"path": "user_bill/index", "path": "user_bill/index",
"style": { "style": {
"navigationBarTitleText": "账单明细" "navigationBarTitleText": "抵扣明细"
} }
}, },
{ {

14
pages/order_details/index.vue
View File

@ -387,6 +387,20 @@
title: '绑卡快捷支付', title: '绑卡快捷支付',
payStatus: this.$store.getters.globalData.sand2_open payStatus: this.$store.getters.globalData.sand2_open
}, },
{
"name": "支付宝支付",
"icon": "icon-zhifubao",
value: 'hf',
title: '支付宝支付',
payStatus: this.$store.getters.globalData.hf_alipay_open,
},
{
"name": "银联扫码",
"icon": "icon-icon-test",
value: 'sandQr',
title: '银联扫码',
payStatus: this.$store.getters.globalData.sand_qr_open,
}
], ],
pay_close: false, pay_close: false,
pay_order_id: '', pay_order_id: '',

14
pages/order_details/stay.vue
View File

@ -249,6 +249,20 @@
value: 'sandCard', value: 'sandCard',
title: '绑卡快捷支付', title: '绑卡快捷支付',
payStatus: this.$store.getters.globalData.sand2_open payStatus: this.$store.getters.globalData.sand2_open
},
{
"name": "支付宝支付",
"icon": "icon-zhifubao",
value: 'hf',
title: '支付宝支付',
payStatus: this.$store.getters.globalData.hf_alipay_open,
},
{
"name": "银联扫码",
"icon": "icon-icon-test",
value: 'sandQr',
title: '银联扫码',
payStatus: this.$store.getters.globalData.sand_qr_open,
} }
], ],
pay_close: false, pay_close: false,

27
pages/users/order_confirm/index.vue
View File

@ -413,7 +413,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class='item acea-row row-between-wrapper' v-if="userInfo.now_money>0"> <view class='item acea-row row-between-wrapper' v-if="open_money">
<view>抵扣券抵扣：</view> <view>抵扣券抵扣：</view>
<view class='money'> <view class='money'>
<text v-if="!now_integral">当前抵扣券<text class="pColor">{{userInfo.now_money}}</text></text> <text v-if="!now_integral">当前抵扣券<text class="pColor">{{userInfo.now_money}}</text></text>
@ -589,6 +589,20 @@
title: '绑卡快捷支付', title: '绑卡快捷支付',
payStatus: this.$store.getters.globalData.sand2_open, payStatus: this.$store.getters.globalData.sand2_open,
}, },
{
"name": "支付宝支付",
"icon": "icon-icon34",
value: 'hf',
title: '支付宝支付',
payStatus: this.$store.getters.globalData.hf_alipay_open,
},
{
"name": "银联扫码",
"icon": "icon-icon-test",
value: 'sandQr',
title: '银联扫码',
payStatus: this.$store.getters.globalData.sand_qr_open,
},
{ {
"name": "铸源星支付", "name": "铸源星支付",
"icon": "haiyuefont haiyue-jifenduihuan", "icon": "haiyuefont haiyue-jifenduihuan",
@ -667,7 +681,7 @@
animated: false, animated: false,
totalPrice: 0, totalPrice: 0,
use_integral: false, use_integral: false,
now_integral: false, now_integral: true,
pagesUrl: "", pagesUrl: "",
orderKey: "", orderKey: "",
offlinePostage: "", offlinePostage: "",
@ -691,6 +705,7 @@
orderPay: false, orderPay: false,
take: [], take: [],
open_integral: 0, open_integral: 0,
open_money: false,
coupon_number: 0, coupon_number: 0,
store_coupon_number: 0, store_coupon_number: 0,
coupon_amount: 0, coupon_amount: 0,
@ -726,7 +741,7 @@
}; };
}, },
computed: { computed: {
...mapGetters(['isLogin','viewColor']), ...mapGetters(['isLogin','viewColor','globalData']),
...configMap(['hide_mer_status', 'alipay_open', 'yue_pay_status']), ...configMap(['hide_mer_status', 'alipay_open', 'yue_pay_status']),
}, },
watch: { watch: {
@ -1143,6 +1158,7 @@
that.$set(that, 'integral_price', res.data.order_total_integral_price); that.$set(that, 'integral_price', res.data.order_total_integral_price);
that.$set(that, 'use_amount', res.data.order_total_amount_price); that.$set(that, 'use_amount', res.data.order_total_amount_price);
that.$set(that, 'open_integral', res.data.openIntegral); that.$set(that, 'open_integral', res.data.openIntegral);
that.$set(that, 'open_money', res.data.openMoney);
that.$set(that, 'use_integral', res.data.useIntegral); that.$set(that, 'use_integral', res.data.useIntegral);
that.$set(that, 'order_extend', (that.order_extend && that.order_extend.length>0) ? that.order_extend : res.data.order_extend); that.$set(that, 'order_extend', (that.order_extend && that.order_extend.length>0) ? that.order_extend : res.data.order_extend);
if(res.data.mer_form_id && !that.order_form.length && res.data.mer_form_info && res.data.mer_form_info.value){ if(res.data.mer_form_id && !that.order_form.length && res.data.mer_form_info && res.data.mer_form_info.value){
@ -1510,6 +1526,8 @@
break; break;
case 'sandCard': case 'sandCard':
case 'sand': case 'sand':
case 'hf':
case 'sandQr':
setTimeout(() => { setTimeout(() => {
location.href = jsConfig; location.href = jsConfig;
}, 100); }, 100);
@ -1523,13 +1541,14 @@
// #ifdef APP-PLUS // #ifdef APP-PLUS
case 'sand': case 'sand':
case 'sandCard': case 'sandCard':
case 'hf':
case 'sandQr':
if (plus.os.name === 'iOS') { if (plus.os.name === 'iOS') {
plus.runtime.openURL(jsConfig); plus.runtime.openURL(jsConfig);
} else if (plus.os.name === 'Android') { } else if (plus.os.name === 'Android') {
plus.runtime.openURL(jsConfig); plus.runtime.openURL(jsConfig);
} }
break; break;
// if (plus.os.name === 'iOS') { // if (plus.os.name === 'iOS') {
// plus.runtime.openURL(jsConfig); // plus.runtime.openURL(jsConfig);
// } else if (plus.os.name === 'Android') { // } else if (plus.os.name === 'Android') {

14
pages/users/order_list/index.vue
View File

@ -336,6 +336,20 @@
title: '绑卡快捷支付', title: '绑卡快捷支付',
payStatus: this.$store.getters.globalData.sand2_open, payStatus: this.$store.getters.globalData.sand2_open,
}, },
{
"name": "支付宝支付",
"icon": "icon-zhifubao",
value: 'hf',
title: '支付宝支付',
payStatus: this.$store.getters.globalData.hf_alipay_open,
},
{
"name": "银联扫码",
"icon": "icon-icon-test",
value: 'sandQr',
title: '银联扫码',
payStatus: this.$store.getters.globalData.sand_qr_open,
}
], ],
pay_close: false, pay_close: false,
pay_order_id: '', pay_order_id: '',

20
pages/users/refund/detail.vue
View File

@ -84,7 +84,25 @@
</view> </view>
</view> </view>
<view class="item"> <view class="item">
<view class="label">退款金额：</view> <view class="label">退货金额：</view>
<view class="txt flex">
<text>¥ {{detail.refund_price-detail.refund_postage}}</text>
</view>
</view>
<view class="item">
<view class="label">退抵扣券：</view>
<view class="txt flex">
<text>¥ {{detail.amount}}</text>
</view>
</view>
<view class="item">
<view class="label">退运费金额：</view>
<view class="txt flex">
<text>¥ {{detail.refund_postage}}</text>
</view>
</view>
<view class="item">
<view class="label">退款总金额：</view>
<view class="txt flex"> <view class="txt flex">
<text>¥ {{detail.refund_price}}</text> <text>¥ {{detail.refund_price}}</text>
</view> </view>

2
pages/users/user_bill/index.vue
View File

@ -4,7 +4,7 @@
<view class='nav acea-row'> <view class='nav acea-row'>
<view class='item' :class='type==0 ? "on":""' @click='changeType(0)'>全部</view> <view class='item' :class='type==0 ? "on":""' @click='changeType(0)'>全部</view>
<view class='item' :class='type==1 ? "on":""' @click='changeType(1)'>消费</view> <view class='item' :class='type==1 ? "on":""' @click='changeType(1)'>消费</view>
<view class='item' :class='type==2 ? "on":""' @click='changeType(2)'>充值</view> <!-- <view class='item' :class='type==2 ? "on":""' @click='changeType(2)'>充值</view> -->
</view> </view>
<view class='sign-record'> <view class='sign-record'>
<view class='list' v-for="(item,index) in userBillList" :key="index"> <view class='list' v-for="(item,index) in userBillList" :key="index">

32
pages/users/user_money/index.vue
View File

@ -4,50 +4,38 @@
<view class='wrapper'> <view class='wrapper'>
<view class='header'> <view class='header'>
<view class='headerCon'> <view class='headerCon'>
<view class='account acea-row row-top row-between'>
<view class='assets'>
<view>总资产(元)</view>
<view class='money'>{{userInfo.now_money || 0}}</view>
</view>
<!-- #ifdef APP-PLUS || H5 -->
<navigator v-if="recharge_switch == 1" url="/pages/users/user_payment/index" hover-class="none" class='recharge t-color'>充值</navigator>
<!-- #endif -->
<!-- #ifdef MP -->
<view v-if="recharge_switch == 1" @click="openSubscribe('/pages/users/user_payment/index')" class='recharge t-color'>充值</view>
<!-- #endif -->
</view>
<view class='cumulative acea-row row-top'> <view class='cumulative acea-row row-top'>
<!-- v-if="balance_func_status == 1" --> <!-- v-if="balance_func_status == 1" -->
<view class='item' > <!-- <view class='item' >
<view>累计充值(元)</view> <view>累计充值(元)</view>
<view class='money'>{{userInfo.total_recharge || 0}}</view> <view class='money'>{{userInfo.total_recharge || 0}}</view>
</view> </view> -->
<view class='item'> <view class='item'>
<view>累计消费(元)</view> <view>累计使用抵扣(券)</view>
<view class='money'>{{userInfo.total_consume || 0}}</view> <view class='money'>{{Math.abs(userInfo.now_money) || 0}}</view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view class='nav acea-row row-middle'> <view class='nav acea-row row-middle'>
<navigator class='item' hover-class='none' url='/pages/users/user_bill/index'> <!-- <navigator class='item' hover-class='none' url='/pages/users/user_bill/index'>
<view class='pictrue'> <view class='pictrue'>
<image :src="domain+'/static/diy/record1'+keyColor+'.png'"></image> <image :src="domain+'/static/diy/record1'+keyColor+'.png'"></image>
</view> </view>
<view>账单记录</view> <view>账单记录</view>
</navigator> </navigator> -->
<navigator class='item' hover-class='none' url='/pages/users/user_bill/index?type=1'> <navigator class='item' hover-class='none' url='/pages/users/user_bill/index?type=1'>
<view class='pictrue'> <view class='pictrue'>
<image :src="domain+'/static/diy/record2'+keyColor+'.png'"></image> <image :src="domain+'/static/diy/record2'+keyColor+'.png'"></image>
</view> </view>
<view>消费记录</view> <view>抵扣记录</view>
</navigator> </navigator>
<navigator class='item' hover-class='none' url='/pages/users/user_bill/index?type=2'> <!-- <navigator class='item' hover-class='none' url='/pages/users/user_bill/index?type=2'>
<view class='pictrue'> <view class='pictrue'>
<image :src="domain+'/static/diy/record3'+keyColor+'.png'"></image> <image :src="domain+'/static/diy/record3'+keyColor+'.png'"></image>
</view> </view>
<view>充值记录</view> <view>充值记录</view>
</navigator> </navigator> -->
</view> </view>
</view> </view>
<recommend v-if="recommend_switch == 1" :hostProduct="hostProduct" :isLogin="isLogin"></recommend> <recommend v-if="recommend_switch == 1" :hostProduct="hostProduct" :isLogin="isLogin"></recommend>
@ -149,7 +137,7 @@
} }
.my-account .wrapper .header { .my-account .wrapper .header {
width: 690rpx; width: 690rpx;
height: 330rpx; height: 220rpx;
background-image: linear-gradient(to right, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%); background-image: linear-gradient(to right, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
border-radius: 16rpx; border-radius: 16rpx;
margin: 0 auto; margin: 0 auto;