liudan
/
zhaozong1
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

11

Browse Source
main
liudan 8 months ago
parent 70413d2940
commit 4c4d848584
15 changed files with 150 additions and 148 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 10
      pages/huitong/huitongbao/index.vue
  2. 30
      pages/order_details/index.vue
  3. 30
      pages/order_details/stay.vue
  4. 30
      pages/points_mall/exchange_record.vue
  5. 38
      pages/points_mall/integral_order.vue
  6. 30
      pages/points_mall/integral_order_details.vue
  7. 8
      pages/user/index.vue
  8. 38
      pages/users/order_confirm/index.vue
  9. 30
      pages/users/order_list/search.vue
  10. 30
      pages/users/presell_order_list/index.vue
  11. 4
      pages/users/user_address/index.vue
  12. 4
      pages/users/user_integral1/benpiao.vue
  13. 8
      pages/users/user_integral1/index.vue
  14. 4
      pages/users/user_payment/index.vue
  15. 4
      pages/users/user_spread_money/index.vue

10
pages/huitong/huitongbao/index.vue
Unescape View File

@ -8,12 +8,12 @@
<view class='nav acea-row'>
<view class='item'>
<view>账户复购积分数</view>
<view class='num'>{{huitong || 0}}</view>
<view class='num'>{{huitong || 0.00}}</view>
</view>
<view class='item'>
<view>账户提现积分数</view>
<view class='num'>{{huitong_frozen || 0}}</view>
<view class='num'>{{huitong_frozen || 0.00}}</view>
</view>
<!-- <view class='item'>
@ -447,8 +447,10 @@
getUserInfo() {
let that = this;
getUserInfo().then((res)=>{
this.huitong = Math.floor(Number(res.data.assets.integral_buy))
this.huitong_frozen = Math.floor(Number(res.data.assets.integral_withdraw));//提现积分
// this.huitong = Math.floor(Number(res.data.assets.integral_buy))
// this.huitong_frozen = Math.floor(Number(res.data.assets.integral_withdraw));//提现积分
this.huitong = Number(res.data.assets.integral_buy).toFixed(2)
this.huitong_frozen = Number(res.data.assets.integral_withdraw).toFixed(2);//提现积分
this.mobilePhoneNum = res.data.phone
this.getIntegralList()
// getIntegralInfo().then(function(res) {

30
pages/order_details/index.vue
Unescape View File

@ -362,21 +362,21 @@
title: '微信快捷支付',
payStatus: 1
},
{
name: "支付宝支付",
icon: "icon-zhifubao",
value: 'alipay',
title: '支付宝支付',
payStatus: this.$store.getters.globalData.alipay_open
},
{
name: "余额支付",
icon: "icon-yuezhifu",
value: 'balance',
title: '可用余额:',
number: 0,
payStatus: this.$store.getters.globalData.yue_pay_status
}
// {
// name: "支付宝支付",
// icon: "icon-zhifubao",
// value: 'alipay',
// title: '支付宝支付',
// payStatus: this.$store.getters.globalData.alipay_open
// },
// {
// name: "余额支付",
// icon: "icon-yuezhifu",
// value: 'balance',
// title: '可用余额:',
// number: 0,
// payStatus: this.$store.getters.globalData.yue_pay_status
// }
],
pay_close: false,
pay_order_id: '',

30
pages/order_details/stay.vue
Unescape View File

@ -221,21 +221,21 @@
title: '微信快捷支付',
payStatus: 1
},
{
name: "支付宝支付",
icon: "icon-zhifubao",
value: 'alipay',
title: '支付宝支付',
payStatus: this.$store.getters.globalData.alipay_open
},
{
name: "余额支付",
icon: "icon-yuezhifu",
value: 'balance',
title: '可用余额:',
number: 0,
payStatus: this.$store.getters.globalData.yue_pay_status
},
// {
// name: "支付宝支付",
// icon: "icon-zhifubao",
// value: 'alipay',
// title: '支付宝支付',
// payStatus: this.$store.getters.globalData.alipay_open
// },
// {
// name: "余额支付",
// icon: "icon-yuezhifu",
// value: 'balance',
// title: '可用余额:',
// number: 0,
// payStatus: this.$store.getters.globalData.yue_pay_status
// },
],
pay_close: false,
pay_order_id: '',

30
pages/points_mall/exchange_record.vue
Unescape View File

@ -87,21 +87,21 @@
title: '微信快捷支付',
payStatus: 1
},
{
name: "支付宝支付",
icon: "icon-zhifubao",
value: 'alipay',
title: '支付宝支付',
payStatus: this.$store.getters.globalData.alipay_open
},
{
name: "余额支付",
icon: "icon-yuezhifu",
value: 'balance',
title: '可用余额:',
number: 0,
payStatus: this.$store.getters.globalData.yue_pay_status
}
// {
// name: "支付宝支付",
// icon: "icon-zhifubao",
// value: 'alipay',
// title: '支付宝支付',
// payStatus: this.$store.getters.globalData.alipay_open
// },
// {
// name: "余额支付",
// icon: "icon-yuezhifu",
// value: 'balance',
// title: '可用余额:',
// number: 0,
// payStatus: this.$store.getters.globalData.yue_pay_status
// }
],
loadend: false,
loading: false,

38
pages/points_mall/integral_order.vue
Unescape View File

@ -183,25 +183,25 @@
title: '微信快捷支付',
payStatus: 1,
},
{
name: "支付宝支付",
icon: "icon-icon34",
// #ifdef H5 || APP-PLUS
value: 'alipay',
// #endif
// #ifdef MP
value: 'alipayQr',
// #endif
title: '支付宝支付',
payStatus: this.$store.getters.globalData.alipay_open
},
{
"name": "余额支付",
"icon": "icon-icon-test",
value: 'balance',
title: '可用余额:',
payStatus: this.$store.getters.globalData.yue_pay_status,
}
// {
// name: "支付宝支付",
// icon: "icon-icon34",
// // #ifdef H5 || APP-PLUS
// value: 'alipay',
// // #endif
// // #ifdef MP
// value: 'alipayQr',
// // #endif
// title: '支付宝支付',
// payStatus: this.$store.getters.globalData.alipay_open
// },
// {
// "name": "余额支付",
// "icon": "icon-icon-test",
// value: 'balance',
// title: '可用余额:',
// payStatus: this.$store.getters.globalData.yue_pay_status,
// }
],
formContent: '',
payType: 'weixin', //支付方式

30
pages/points_mall/integral_order_details.vue
Unescape View File

@ -172,21 +172,21 @@
title: '微信快捷支付',
payStatus: 1
},
{
name: "支付宝支付",
icon: "icon-zhifubao",
value: 'alipay',
title: '支付宝支付',
payStatus: this.$store.getters.globalData.alipay_open
},
{
name: "余额支付",
icon: "icon-yuezhifu",
value: 'balance',
title: '可用余额:',
number: 0,
payStatus: this.$store.getters.globalData.yue_pay_status
},
// {
// name: "支付宝支付",
// icon: "icon-zhifubao",
// value: 'alipay',
// title: '支付宝支付',
// payStatus: this.$store.getters.globalData.alipay_open
// },
// {
// name: "余额支付",
// icon: "icon-yuezhifu",
// value: 'balance',
// title: '可用余额:',
// number: 0,
// payStatus: this.$store.getters.globalData.yue_pay_status
// },
],
pay_close: false,
pay_order_id: '',

8
pages/user/index.vue
Unescape View File

@ -367,10 +367,10 @@
activeRouter: '',
sysHeight: sysHeight,
assets:{
diamond: "0.00",
integral_buy: "0.00",
integral_withdraw: "0.00",
stock: "0.00",
diamond: "0",
integral_buy: "0",
integral_withdraw: "0",
stock: "0",
},
show:false
}

38
pages/users/order_confirm/index.vue
Unescape View File

@ -543,25 +543,25 @@
title: '微信快捷支付',
payStatus: 1,
},
{
name: "支付宝支付",
icon: "icon-icon34",
// #ifdef H5 || APP-PLUS
value: 'alipay',
// #endif
// #ifdef MP
value: 'alipayQr',
// #endif
title: '支付宝支付',
payStatus: this.$store.getters.globalData.alipay_open
},
{
"name": "余额支付",
"icon": "icon-icon-test",
value: 'balance',
title: '可用余额:',
payStatus: this.$store.getters.globalData.yue_pay_status,
},
// {
// name: "支付宝支付",
// icon: "icon-icon34",
// // #ifdef H5 || APP-PLUS
// value: 'alipay',
// // #endif
// // #ifdef MP
// value: 'alipayQr',
// // #endif
// title: '支付宝支付',
// payStatus: this.$store.getters.globalData.alipay_open
// },
// {
// "name": "余额支付",
// "icon": "icon-icon-test",
// value: 'balance',
// title: '可用余额:',
// payStatus: this.$store.getters.globalData.yue_pay_status,
// },
{
"name": "线下支付",
"icon": "icon-yinhangqia",

30
pages/users/order_list/search.vue
Unescape View File

@ -255,21 +255,21 @@
title: '微信快捷支付',
payStatus: 1
},
{
name: "支付宝支付",
icon: "icon-zhifubao",
value: 'alipay',
title: '支付宝支付',
payStatus: this.$store.getters.globalData.alipay_open
},
{
name: "余额支付",
icon: "icon-yuezhifu",
value: 'balance',
title: '可用余额:',
number: 0,
payStatus: this.$store.getters.globalData.yue_pay_status
}
// {
// name: "支付宝支付",
// icon: "icon-zhifubao",
// value: 'alipay',
// title: '支付宝支付',
// payStatus: this.$store.getters.globalData.alipay_open
// },
// {
// name: "余额支付",
// icon: "icon-yuezhifu",
// value: 'balance',
// title: '可用余额:',
// number: 0,
// payStatus: this.$store.getters.globalData.yue_pay_status
// }
],
pay_close: false,
pay_order_id: '',

30
pages/users/presell_order_list/index.vue
Unescape View File

@ -107,21 +107,21 @@
title: '微信快捷支付',
payStatus: 1
},
{
name: "支付宝支付",
icon: "icon-zhifubao",
value: 'alipay',
title: '支付宝支付',
payStatus: this.$store.getters.globalData.alipay_open
},
{
name: "余额支付",
icon: "icon-yuezhifu",
value: 'balance',
title: '可用余额:',
number: 0,
payStatus: this.$store.getters.globalData.yue_pay_status
}
// {
// name: "支付宝支付",
// icon: "icon-zhifubao",
// value: 'alipay',
// title: '支付宝支付',
// payStatus: this.$store.getters.globalData.alipay_open
// },
// {
// name: "余额支付",
// icon: "icon-yuezhifu",
// value: 'balance',
// title: '可用余额:',
// number: 0,
// payStatus: this.$store.getters.globalData.yue_pay_status
// }
],
pay_close: false,
pay_order_id: '',

4
pages/users/user_address/index.vue
Unescape View File

@ -37,10 +37,10 @@
</view>
<button class='keepBnt' form-type="submit" :disabled="loading">立即保存</button>
<!-- #ifdef MP -->
<view class="wechatAddress" v-if="!address_id" @click="getWxAddress">导入微信地址</view>
<!-- <view class="wechatAddress" v-if="!address_id" @click="getWxAddress">导入微信地址</view> -->
<!-- #endif -->
<!-- #ifdef H5 -->
<view class="wechatAddress" v-if="this.$wechat.isWeixin() && !address_id" @click="getAddress">导入微信地址</view>
<!-- <view class="wechatAddress" v-if="this.$wechat.isWeixin() && !address_id" @click="getAddress">导入微信地址</view> -->
<!-- #endif -->
</view>
</form>

4
pages/users/user_integral1/benpiao.vue
Unescape View File

@ -8,7 +8,7 @@
<view class='nav acea-row'>
<view class='item'>
<view>账户本票数</view>
<view class='num'>{{contribution || 0}}</view>
<view class='num'>{{contribution || 0.00}}</view>
</view>
<!-- <view class='item'>
@ -202,7 +202,7 @@
getUserInfo: function() {
let that = this;
getUserInfo().then((res)=>{
this.contribution = Math.floor(Number(res.data.assets.stock))
this.contribution = Number(res.data.assets.stock).toFixed(2)
// this.contribution_frozen = res.data.assets.contribution_frozen
getIntegralInfo().then(function(res) {
that.$set(that,'userInfo',res.data);

8
pages/users/user_integral1/index.vue
Unescape View File

@ -8,7 +8,7 @@
<view class='nav acea-row'>
<view class='item'>
<view>账户钻石数</view>
<view class='num'>{{huitong || 0}}</view>
<view class='num'>{{huitong || 0.00}}</view>
</view>
@ -313,7 +313,7 @@
});
return;
}
DiamondTostock({count:Math.floor(Number(this.huitongToConsumeNum))}).then(res=>{
DiamondTostock({count:Number(this.huitongToConsumeNum).toFixed(2)}).then(res=>{
if(res.status==200){
this.getUserInfo()
@ -364,7 +364,7 @@
});
return;
}
this.zhuanrang.count = Math.floor(Number(this.zhuanrang.count))
this.zhuanrang.count = Number(this.zhuanrang.count).toFixed(2)
sendDiamond(this.zhuanrang).then(res=>{
@ -444,7 +444,7 @@
getUserInfo() {
let that = this;
getUserInfo().then((res)=>{
this.huitong = Math.floor(Number(res.data.assets.diamond));
this.huitong = Number(res.data.assets.diamond).toFixed(2);
this.mobilePhoneNum = res.data.phone
this.getIntegralList()

4
pages/users/user_payment/index.vue
Unescape View File

@ -8,7 +8,7 @@
<view class='item'>
<view>预存金额</view>
<!-- <view class='num'>{{ userinfo.now_money || 0 }}</view> -->
<view class='num'>{{ deposit_total || 0 }}</view>
<view class='num'>{{ deposit_total || 0.00 }}</view>
</view>
@ -220,7 +220,7 @@
// that.$set(that, 'userinfo', res.data);
// })
getUserInfo().then((res)=>{
this.deposit_total = Math.floor(Number(res.data.assets.deposit_total));
this.deposit_total = Number(res.data.assets.deposit_total).toFixed(2);
})

4
pages/users/user_spread_money/index.vue
Unescape View File

@ -17,9 +17,9 @@
<view class='name line1' v-if="item.extract_type == 2">支付宝提现</view>
<view class='name line1' v-if="item.extract_type == 3">提现到零钱</view>
</block>
<!-- <block v-else>
<block v-else>
<view class='name line1'>提现失败<text class="message">({{item.fail_msg}})</text></view>
</block> -->
</block>
<view>{{item.create_time}}</view>
</view>
<view style="margin:0 10px;">

Write Preview
Loading…
Cancel
Save