Skip to content

G
GangShi-un2
提交 95788a8d authored 作者: 彭涛's avatar 彭涛
浏览文件
操作

电客信用分修复

上级 2c4c133e
全部展开 显示空白字符变更
内嵌 并排
正在显示 包含 559 行增加 和 60 行删除
pages/group/GroupCompany.vue
浏览文件 @ 95788a8d
...@@ -526,7 +526,7 @@ ...@@ -526,7 +526,7 @@
getBasicCreditScore() { getBasicCreditScore() {
let that = this let that = this
get(api.getBasicCreditScore, { get(api.getBasicCreditScore, {
type: 1, type: 2,
userId: this.electricId userId: this.electricId
}).then(res => { }).then(res => {
if (res.code == 200) { if (res.code == 200) {
......
pages/myInfo/myInfo.vue
浏览文件 @ 95788a8d
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
<view class="myInfo_items" v-for="(item,index) in earningsList" :key="index" <view class="myInfo_items" v-for="(item,index) in earningsList" :key="index"
@click="linkToEarnings(index)"> @click="linkToEarnings(index)">
{{item.name}} {{item.name}}
<view class="text"><text v-if="item.others!='null'">{{item.others}}</text></view> <view class="text"><text v-if="item.others!='null'">￥{{item.others?item.others:'00'}}</text></view>
</view> </view>
</view> </view>
</view> </view>
...@@ -514,8 +514,10 @@ ...@@ -514,8 +514,10 @@
if (!user) { if (!user) {
that.tabbarIndex = 2 that.tabbarIndex = 2
that.isuser = false that.isuser = false
that.contractA = true
that.earningsList = that.earningsList_gaoji that.earningsList = that.earningsList_gaoji
that.personageList = that.personageList_gaoji that.personageList = that.personageList_gaoji
that.toollist = that.toollist_gaoji
return false return false
} else { } else {
that.credit = user.creditScore that.credit = user.creditScore
...@@ -660,22 +662,22 @@ ...@@ -660,22 +662,22 @@
type: that.type type: that.type
}).then(res => { }).then(res => {
if (res.code == 200) { if (res.code == 200) {
that.earningsList_dianke[0].others = '￥' + res.data.spotIncome //现货收益 that.earningsList_dianke[0].others = res.data.spotIncome //现货收益
that.earningsList_dianke[1].others = '￥' + res.data.intermediateIncome //居间收益 that.earningsList_dianke[1].others = res.data.intermediateIncome //居间收益
that.earningsList_dianke[2].others = '￥' + res.data.commissionIncome //佣金收益 that.earningsList_dianke[2].others = res.data.commissionIncome //佣金收益
that.earningsList_dianke[3].others = '￥' + res.data.stockIntermediaryIncome //存量居间收益 that.earningsList_dianke[3].others = res.data.stockIntermediaryIncome //存量居间收益
that.earningsList_dianke[4].others = '￥' + res.data.pendingIncome //服务费收益 that.earningsList_dianke[4].others = res.data.pendingIncome //服务费收益
that.earningsList_dianke[5].others = '￥' + res.data.pendingIncome //待确认收益 that.earningsList_dianke[5].others = res.data.pendingIncome //待确认收益
that.earningsList_gaoji[0].others = '￥' + res.data.corporateDiscountAmount //企业优惠收益 that.earningsList_gaoji[0].others = res.data.corporateDiscountAmount //企业优惠收益
that.earningsList_gaoji[1].others = '￥' + res.data.spotIncome //现货收益 that.earningsList_gaoji[1].others = res.data.spotIncome //现货收益
that.earningsList_gaoji[2].others = '￥' + res.data.pendingIncome //待确认收益 that.earningsList_gaoji[2].others = res.data.pendingIncome //待确认收益
that.earningsList_zhongji[0].others = '￥' + res.data.corporateDiscountAmount //企业优惠收益 that.earningsList_zhongji[0].others = res.data.corporateDiscountAmount //企业优惠收益
that.earningsList_zhongji[1].others = '￥' + res.data.spotIncome //现货认收益 that.earningsList_zhongji[1].others = res.data.spotIncome //现货认收益
that.earningsList_zhongji[2].others = '￥' + res.data.pendingIncome //待确认收益 that.earningsList_zhongji[2].others = res.data.pendingIncome //待确认收益
that.earningsList_putong[0].others = '￥' + res.data.corporateDiscountAmount //企业优惠收益 that.earningsList_putong[0].others = res.data.corporateDiscountAmount //企业优惠收益
that.earningsList_putong[1].others = '￥' + res.data.pendingIncome //待确认收益 that.earningsList_putong[1].others = res.data.pendingIncome //待确认收益
that.earningsList_cunliang[0].others = '￥' + res.data.corporateDiscountAmount //企业优惠收益 that.earningsList_cunliang[0].others = res.data.corporateDiscountAmount //企业优惠收益
that.earningsList_cunliang[1].others = '￥' + res.data.pendingIncome //待确认收益 that.earningsList_cunliang[1].others = res.data.pendingIncome //待确认收益
} }
}) })
}, },
......
static/util/api.js
浏览文件 @ 95788a8d
const erp = erp || {}; //wxb21370ac25ee51b0,//wx45bb68de16ddddb7 const erp = erp || {}; //wxb21370ac25ee51b0,//wx45bb68de16ddddb7
// const DOMAIN = 'http://192.168.1.107:9099/'; // 峰煜 const DOMAIN = 'http://192.168.1.107:9099/'; // 峰煜
const DOMAIN = 'https://dev.diaosaas.com/diaoyun/' //测试 // const DOMAIN = 'https://dev.diaosaas.com/diaoyun/' //测试
// const DOMAIN = 'http://192.168.1.178:9099/' // 国禄 // const DOMAIN = 'http://192.168.1.178:9099/' // 国禄
// const DOMAIN = 'http://192.168.1.197:9099/' // 志就 // const DOMAIN = 'http://192.168.1.197:9099/' // 志就
// const DOMAIN = 'https://fire.huoshitou.net/diaoyun/' // 正式 // const DOMAIN = 'https://fire.huoshitou.net/diaoyun/' // 正式
......
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myInfo/myInfo.js.map
浏览文件 @ 95788a8d
This source diff could not be displayed because it is too large. You can view the blob instead.
unpackage/dist/dev/mp-weixin/common/vendor.js
浏览文件 @ 95788a8d
...@@ -16505,8 +16505,8 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default = ...@@ -16505,8 +16505,8 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
"use strict"; "use strict";
Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var erp = erp || {}; //wxb21370ac25ee51b0,//wx45bb68de16ddddb7 Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var erp = erp || {}; //wxb21370ac25ee51b0,//wx45bb68de16ddddb7
// const DOMAIN = 'http://192.168.1.107:9099/'; // 峰煜 var DOMAIN = 'http://192.168.1.107:9099/'; // 峰煜
var DOMAIN = 'https://dev.diaosaas.com/diaoyun/'; //测试 // const DOMAIN = 'https://dev.diaosaas.com/diaoyun/' //测试
// const DOMAIN = 'http://192.168.1.178:9099/' // 国禄 // const DOMAIN = 'http://192.168.1.178:9099/' // 国禄
// const DOMAIN = 'http://192.168.1.197:9099/' // 志就 // const DOMAIN = 'http://192.168.1.197:9099/' // 志就
// const DOMAIN = 'https://fire.huoshitou.net/diaoyun/' // 正式 // const DOMAIN = 'https://fire.huoshitou.net/diaoyun/' // 正式
......
unpackage/dist/dev/mp-weixin/pages/group/GroupCompany.js
浏览文件 @ 95788a8d
...@@ -686,7 +686,7 @@ var _api = _interopRequireDefault(__webpack_require__(/*! ../../static/util/api. ...@@ -686,7 +686,7 @@ var _api = _interopRequireDefault(__webpack_require__(/*! ../../static/util/api.
getBasicCreditScore: function getBasicCreditScore() { getBasicCreditScore: function getBasicCreditScore() {
var that = this; var that = this;
(0, _fun.get)(_api.default.getBasicCreditScore, { (0, _fun.get)(_api.default.getBasicCreditScore, {
type: 1, type: 2,
userId: this.electricId }). userId: this.electricId }).
then(function (res) { then(function (res) {
if (res.code == 200) { if (res.code == 200) {
......
unpackage/dist/dev/mp-weixin/pages/myInfo/myInfo.js
浏览文件 @ 95788a8d
...@@ -646,8 +646,10 @@ var app = getApp();var _default = { data: function data() {return { contractNum: ...@@ -646,8 +646,10 @@ var app = getApp();var _default = { data: function data() {return { contractNum:
if (!user) { if (!user) {
that.tabbarIndex = 2; that.tabbarIndex = 2;
that.isuser = false; that.isuser = false;
that.contractA = true;
that.earningsList = that.earningsList_gaoji; that.earningsList = that.earningsList_gaoji;
that.personageList = that.personageList_gaoji; that.personageList = that.personageList_gaoji;
that.toollist = that.toollist_gaoji;
return false; return false;
} else { } else {
that.credit = user.creditScore; that.credit = user.creditScore;
...@@ -792,22 +794,22 @@ var app = getApp();var _default = { data: function data() {return { contractNum: ...@@ -792,22 +794,22 @@ var app = getApp();var _default = { data: function data() {return { contractNum:
type: that.type }). type: that.type }).
then(function (res) { then(function (res) {
if (res.code == 200) { if (res.code == 200) {
that.earningsList_dianke[0].others = '￥' + res.data.spotIncome; //现货收益 that.earningsList_dianke[0].others = res.data.spotIncome; //现货收益
that.earningsList_dianke[1].others = '￥' + res.data.intermediateIncome; //居间收益 that.earningsList_dianke[1].others = res.data.intermediateIncome; //居间收益
that.earningsList_dianke[2].others = '￥' + res.data.commissionIncome; //佣金收益 that.earningsList_dianke[2].others = res.data.commissionIncome; //佣金收益
that.earningsList_dianke[3].others = '￥' + res.data.stockIntermediaryIncome; //存量居间收益 that.earningsList_dianke[3].others = res.data.stockIntermediaryIncome; //存量居间收益
that.earningsList_dianke[4].others = '￥' + res.data.pendingIncome; //服务费收益 that.earningsList_dianke[4].others = res.data.pendingIncome; //服务费收益
that.earningsList_dianke[5].others = '￥' + res.data.pendingIncome; //待确认收益 that.earningsList_dianke[5].others = res.data.pendingIncome; //待确认收益
that.earningsList_gaoji[0].others = '￥' + res.data.corporateDiscountAmount; //企业优惠收益 that.earningsList_gaoji[0].others = res.data.corporateDiscountAmount; //企业优惠收益
that.earningsList_gaoji[1].others = '￥' + res.data.spotIncome; //现货收益 that.earningsList_gaoji[1].others = res.data.spotIncome; //现货收益
that.earningsList_gaoji[2].others = '￥' + res.data.pendingIncome; //待确认收益 that.earningsList_gaoji[2].others = res.data.pendingIncome; //待确认收益
that.earningsList_zhongji[0].others = '￥' + res.data.corporateDiscountAmount; //企业优惠收益 that.earningsList_zhongji[0].others = res.data.corporateDiscountAmount; //企业优惠收益
that.earningsList_zhongji[1].others = '￥' + res.data.spotIncome; //现货认收益 that.earningsList_zhongji[1].others = res.data.spotIncome; //现货认收益
that.earningsList_zhongji[2].others = '￥' + res.data.pendingIncome; //待确认收益 that.earningsList_zhongji[2].others = res.data.pendingIncome; //待确认收益
that.earningsList_putong[0].others = '￥' + res.data.corporateDiscountAmount; //企业优惠收益 that.earningsList_putong[0].others = res.data.corporateDiscountAmount; //企业优惠收益
that.earningsList_putong[1].others = '￥' + res.data.pendingIncome; //待确认收益 that.earningsList_putong[1].others = res.data.pendingIncome; //待确认收益
that.earningsList_cunliang[0].others = '￥' + res.data.corporateDiscountAmount; //企业优惠收益 that.earningsList_cunliang[0].others = res.data.corporateDiscountAmount; //企业优惠收益
that.earningsList_cunliang[1].others = '￥' + res.data.pendingIncome; //待确认收益 that.earningsList_cunliang[1].others = res.data.pendingIncome; //待确认收益
} }
}); });
}, },
......
unpackage/dist/dev/mp-weixin/pagesA/agreement/protocol/PrivacyProtocol.js
浏览文件 @ 95788a8d
...@@ -129,6 +129,248 @@ __webpack_require__.r(__webpack_exports__); ...@@ -129,6 +129,248 @@ __webpack_require__.r(__webpack_exports__);
/*! no static exports found */ /*! no static exports found */
/***/ (function(module, exports) { /***/ (function(module, exports) {
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
// //
// //
// //
......
unpackage/dist/dev/mp-weixin/pagesA/agreement/protocol/PrivacyProtocol.wxss
浏览文件 @ 95788a8d
...@@ -25,15 +25,18 @@ ...@@ -25,15 +25,18 @@
/* 透明度 */ /* 透明度 */
/* 文章场景相关 */ /* 文章场景相关 */
.PrivacyProtocol { .PrivacyProtocol {
padding-top: 32rpx; padding: 32rpx;
width: 100%; width: 100%;
height: 100%; height: 100%;
background-color: #f4f5f7; background-color: #f4f5f7;
} }
.PrivacyProtocol .PrivacyProtocol_box { .PrivacyProtocol view {
padding: 56rpx; font-size: 24rpx;
background: #fff; margin: 16rpx 0;
font-size: 28rpx; }
color: #333; .PrivacyProtocol view text {
margin: 8rpx 0;
display: block;
text-indent: 32rpx;
} }
unpackage/dist/dev/mp-weixin/static/util/api.js
浏览文件 @ 95788a8d
const erp = erp || {}; //wxb21370ac25ee51b0,//wx45bb68de16ddddb7 const erp = erp || {}; //wxb21370ac25ee51b0,//wx45bb68de16ddddb7
// const DOMAIN = 'http://192.168.1.107:9099/'; // 峰煜 const DOMAIN = 'http://192.168.1.107:9099/'; // 峰煜
const DOMAIN = 'https://dev.diaosaas.com/diaoyun/' //测试 // const DOMAIN = 'https://dev.diaosaas.com/diaoyun/' //测试
// const DOMAIN = 'http://192.168.1.178:9099/' // 国禄 // const DOMAIN = 'http://192.168.1.178:9099/' // 国禄
// const DOMAIN = 'http://192.168.1.197:9099/' // 志就 // const DOMAIN = 'http://192.168.1.197:9099/' // 志就
// const DOMAIN = 'https://fire.huoshitou.net/diaoyun/' // 正式 // const DOMAIN = 'https://fire.huoshitou.net/diaoyun/' // 正式
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论