diff --git a/api/user.js b/api/user.js
index 679ad10..6a0f17b 100644
--- a/api/user.js
+++ b/api/user.js
@@ -354,6 +354,10 @@ export function getAddressDefault() {
export function getRechargeApi() {
return request.get("common/recharge_quota");
}
+export function depositData() {
+ return request.get("deposit/data");
+}
+
/**
* 登陆记录
*/
@@ -775,6 +779,11 @@ export function systemFormData(id) {
export function getassetsLog(data) {
return request.get(`user/assetsLog`,data)
}
+// 积分
+//赠送积分
+export function changeHuitong(data) {
+ return request.post(`user/send/integral`,data)
+}
//配置
export function getConfig() {
return request.get(`exchange/config`)
@@ -783,12 +792,21 @@ export function getConfig() {
export function scoreToDiamond(data) {
return request.post(`user/exchange/diamond`,data)
}
+// 钻石
+// 赠送钻石
+export function sendDiamond(data) {
+ return request.post(`user/send/diamond`,data)
+}
+// 钻石兑换本票
+export function DiamondTostock(data) {
+ return request.post(`user/exchange/stock`,data)
+}
+
+
+
+
-//转让惠通宝
-export function changeHuitong(data) {
- return request.post(`user/send/huitong`,data)
-}
//消费积分兑分红点
export function jifenToShare(data) {
diff --git a/pages.json b/pages.json
index 5d4e3a6..37dd74b 100644
--- a/pages.json
+++ b/pages.json
@@ -101,24 +101,8 @@
"navigationBarTitleText": "网站已关闭"
}
},
- {
- "path": "pages/order_details/index",
- "style": {
- "navigationBarTitleText": "订单详情"
- }
- },
- {
- "path": "pages/order_details/stay",
- "style": {
- "navigationBarTitleText": "订单详情"
- }
- },
- {
- "path": "pages/order_details/delivery",
- "style": {
- "navigationBarTitleText": "配送详情"
- }
- },
+
+
{
"path": "pages/order_pay_back/index",
"style": {
@@ -127,6 +111,31 @@
}
],
"subPackages": [{
+ "root": "pages/order_details",
+ "name": "order_details",
+ "pages": [
+ {
+ "path": "index",
+ "style": {
+ "navigationBarTitleText": "订单详情"
+ }
+ },
+ {
+ "path": "stay",
+ "style": {
+ "navigationBarTitleText": "订单详情"
+
+ }
+ },
+ {
+ "path": "delivery",
+ "style": {
+ "navigationBarTitleText": "配送详情"
+
+ }
+ }
+ ]
+ },{
"root": "pages/huitong",
"name": "huitong",
"pages": [
@@ -228,11 +237,12 @@
}
},
{
- "path": "user_integral/index",
+ "path": "user_integral1/index",
"style": {
- "navigationBarTitleText": "积分详情"
+ "navigationBarTitleText": "账户钻石数"
}
},
+
{
"path": "user_integral1/benpiao",
"style": {
@@ -330,7 +340,7 @@
{
"path": "user_payment/index",
"style": {
- "navigationBarTitleText": "余额充值"
+ "navigationBarTitleText": "预存金额"
}
},
{
diff --git a/pages/huitong/huitongbao/index.vue b/pages/huitong/huitongbao/index.vue
index 79f769e..b85b623 100644
--- a/pages/huitong/huitongbao/index.vue
+++ b/pages/huitong/huitongbao/index.vue
@@ -7,12 +7,12 @@
-->
- 当前惠通宝/个
+ 账户复购积分数
{{huitong || 0}}
- 冻结惠通宝/个
+ 账户提现积分数
{{huitong_frozen || 0}}
@@ -41,17 +41,18 @@
@click='nav(index)'>{{item.name}}
-->
- 惠通宝兑换消费积分
-
- 立即兑换
+ 提现积分转让
+
+ 立即转让
- 惠通宝转让
-
- 立即转让
+ 提现积分兑换钻石
+
+ 立即兑换
+
分值明细
@@ -115,22 +116,22 @@
- 惠通宝:消费积分比值
+ 积分 : 钻石比值
1:{{huitongToConsume}}
- 兑换惠通宝
+ 兑换钻石数
- 可兑换积分
+ 需支付积分
{{huitongToConsumeNum?(huitongToConsumeNum*huitongToConsume).toFixed(2):0}}
@@ -145,10 +146,10 @@
- 转让惠通宝数量
+ 转让积分数量
+
+ 注：积分互转平台收取3%钻石手续费
+
确定
@@ -197,7 +201,7 @@
// +----------------------------------------------------------------------
// | Author: CRMEB Team
// +----------------------------------------------------------------------
- import { getIntegralInfo, getassetsLog, getAgreementApi,huitongToConsume,getUserInfo,registerVerify,changeHuitong,getConfig} from '@/api/user.js';
+ import { getIntegralInfo, getassetsLog,scoreToDiamond, getAgreementApi,getUserInfo,registerVerify,changeHuitong,getConfig} from '@/api/user.js';
import {
mapGetters
} from "vuex";
@@ -250,7 +254,7 @@
count:0,
phoneTo:null,
smsCode:null,
- type:'huitong',
+ type:'integral',
},
huitongToConsume:1,
huitongToConsumeNum:0,
@@ -275,7 +279,7 @@
}
this.getAgreement();
getConfig().then(res=>{
- this.huitongToConsume = res.data?res.data.huitongToConsume:1
+ this.huitongToConsume = res.data?res.data.integralToDiamond:1
})
},
@@ -307,12 +311,12 @@
}
if(this.huitongToConsumeNum>this.huitong){
uni.showToast({
- title: '惠通宝不足',
+ title: '积分不足',
icon:'none'
});
return;
}
- huitongToConsume({count:Number(this.huitongToConsumeNum).toFixed(2)}).then(res=>{
+ scoreToDiamond({count:Number(this.huitongToConsumeNum).toFixed(2)}).then(res=>{
if(res.status==200){
this.getUserInfo()
@@ -334,7 +338,7 @@
}
if(this.zhuanrang.count>this.huitong){
uni.showToast({
- title: '惠通宝不足',
+ title: '积分不足',
icon:'none'
});
return;
@@ -443,8 +447,8 @@
getUserInfo() {
let that = this;
getUserInfo().then((res)=>{
- this.huitong = res.data.assets.huitong
- this.huitong_frozen = res.data.assets.huitong_frozen;
+ this.huitong = res.data.assets.integral_buy
+ this.huitong_frozen = res.data.assets.integral_withdraw;//提现积分
this.mobilePhoneNum = res.data.phone
this.getIntegralList()
// getIntegralInfo().then(function(res) {
@@ -478,7 +482,7 @@
getassetsLog({
page: that.page,
limit: that.limit,
- asset_type:4
+ asset_type:1
}).then(function(res) {
let list = res.data.list,
loadend = list.length < that.limit;
@@ -844,4 +848,13 @@
border-radius: 0 !important;
}
}
+ .msg{
+
+ font-family: Alibaba PuHuiTi;
+ font-weight: 400;
+ font-size: 24rpx;
+ margin:31rpx 0;
+ text-align: center;
+ color: #999999;
+ }
diff --git a/pages/index/component/menus.vue b/pages/index/component/menus.vue
index a29c66c..36899dd 100644
--- a/pages/index/component/menus.vue
+++ b/pages/index/component/menus.vue
@@ -63,6 +63,7 @@
mounted() {},
methods: {
menusTap(url) {
+
let data = this.$util.stringIntercept(url, 1, '\?');
data = this.$util.stringIntercept(data, 1, '\=');
uni.setStorageSync('storeIndex', data);
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 36a9b4e..729e9cb 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -84,7 +84,7 @@
{{assets.integral_buy}}
积分
-
+
{{assets.diamond}}
钻石
@@ -92,8 +92,8 @@
{{assets.stock}}
本票
-
- {{assets.integral_withdraw}}
+
+ {{assets.deposit_total}}
预存金额
diff --git a/pages/users/user_integral1/benpiao.vue b/pages/users/user_integral1/benpiao.vue
index 01323e2..f34f823 100644
--- a/pages/users/user_integral1/benpiao.vue
+++ b/pages/users/user_integral1/benpiao.vue
@@ -235,7 +235,7 @@
getassetsLog({
page: that.page,
limit: that.limit,
- asset_type:5
+ asset_type:3
}).then(function(res) {
console.log(res,"---")
let list = res.data.list,
diff --git a/pages/users/user_integral1/fenhong.vue b/pages/users/user_integral1/fenhong.vue
deleted file mode 100644
index 406604e..0000000
--- a/pages/users/user_integral1/fenhong.vue
+++ /dev/null
@@ -1,535 +0,0 @@
-
-
-
-
-
-
-
- 分值明细
-
-
-
- 提示：您有部分积分将于{{userInfo.clear.nextClearDay}}过期，请尽快使用！
-
-
-
- {{item.type}}
- {{item.create_time}}
-
-
-
-
- {{getLable(item.status)}}
-
- {{item.count}}
- {{item.count}}
-
-
-
- {{loadTitle}}
-
-
-
-
-
-
-
-
-
-
-
-
- 积分说明
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/pages/users/user_integral1/index.vue b/pages/users/user_integral1/index.vue
index 31eb380..7a7b684 100644
--- a/pages/users/user_integral1/index.vue
+++ b/pages/users/user_integral1/index.vue
@@ -7,15 +7,16 @@
-->
- 当前福利积分
- {{welfare || 0}}
+ 账户钻石数
+ {{huitong || 0}}
-
- 冻结福利积分
- {{welfare_frozen || 0}}
+
+
+
+ 钻石兑换本票
+
+ 立即兑换
+
+
+
+ 钻石转让
+
+ 立即转让
+
+
+
+
分值明细
-
+
提示：您有部分积分将于{{userInfo.clear.nextClearDay}}过期，请尽快使用！
- {{item.type}}
+ {{item.type}}
+ {{(item.ext != null&&item.ext.from_phone)?`来自${item.ext.from_phone}`:(item.ext !== null&&item.ext.to_phone)?`转给${item.ext.to_phone}`:''}}
+
{{item.create_time}}
@@ -55,6 +72,7 @@
{{item.count}}
{{item.count}}
+
{{loadTitle}}
@@ -83,7 +101,7 @@
-->
-
+
+
+
+
+ 钻石 : 本票比值
+ 1:{{huitongToConsume}}
+
+
+
+
+ 兑换本票数
+
+
+
+ 需支付钻石
+ {{huitongToConsumeNum?(huitongToConsumeNum*huitongToConsume).toFixed(2):0}}
+
+
+
+
+
+ 立即兑换
+
+
+
+
+
+
+
+ 转让钻石数量
+
+
+
+ 收款人注册手机号
+
+
+
+ 转让人手机验证码
+
+
+
+
+
+
+
+ 注：钻石互转平台收取3%钻石手续费
+
+
+ 确定
+
+
+
+
+