Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
G
GangShi-un2
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
黄旭新
GangShi-un2
Commits
95788a8d
提交
95788a8d
authored
4月 26, 2021
作者:
彭涛
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
电客信用分修复
上级
2c4c133e
全部展开
显示空白字符变更
内嵌
并排
正在显示
16 个修改的文件
包含
559 行增加
和
60 行删除
+559
-60
GroupCompany.vue
pages/group/GroupCompany.vue
+1
-1
myInfo.vue
pages/myInfo/myInfo.vue
+20
-18
PrivacyProtocol.vue
pagesA/agreement/protocol/PrivacyProtocol.vue
+253
-6
api.js
static/util/api.js
+2
-2
vendor.js.map
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
+1
-1
GroupCompany.js.map
.../dev/.sourcemap/mp-weixin/pages/group/GroupCompany.js.map
+1
-1
myInfo.js.map
.../dist/dev/.sourcemap/mp-weixin/pages/myInfo/myInfo.js.map
+1
-1
PrivacyProtocol.js.map
...p-weixin/pagesA/agreement/protocol/PrivacyProtocol.js.map
+1
-1
vendor.js
unpackage/dist/dev/mp-weixin/common/vendor.js
+2
-2
GroupCompany.js
unpackage/dist/dev/mp-weixin/pages/group/GroupCompany.js
+1
-1
myInfo.js
unpackage/dist/dev/mp-weixin/pages/myInfo/myInfo.js
+18
-16
myInfo.wxml
unpackage/dist/dev/mp-weixin/pages/myInfo/myInfo.wxml
+1
-1
PrivacyProtocol.js
...ev/mp-weixin/pagesA/agreement/protocol/PrivacyProtocol.js
+242
-0
PrivacyProtocol.wxml
.../mp-weixin/pagesA/agreement/protocol/PrivacyProtocol.wxml
+4
-1
PrivacyProtocol.wxss
.../mp-weixin/pagesA/agreement/protocol/PrivacyProtocol.wxss
+9
-6
api.js
unpackage/dist/dev/mp-weixin/static/util/api.js
+2
-2
没有找到文件。
pages/group/GroupCompany.vue
浏览文件 @
95788a8d
...
...
@@ -526,7 +526,7 @@
getBasicCreditScore
()
{
let
that
=
this
get
(
api
.
getBasicCreditScore
,
{
type
:
1
,
type
:
2
,
userId
:
this
.
electricId
}).
then
(
res
=>
{
if
(
res
.
code
==
200
)
{
...
...
pages/myInfo/myInfo.vue
浏览文件 @
95788a8d
...
...
@@ -71,7 +71,7 @@
<view
class=
"myInfo_items"
v-for=
"(item,index) in earningsList"
:key=
"index"
@
click=
"linkToEarnings(index)"
>
{{
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>
...
...
@@ -514,8 +514,10 @@
if
(
!
user
)
{
that
.
tabbarIndex
=
2
that
.
isuser
=
false
that
.
contractA
=
true
that
.
earningsList
=
that
.
earningsList_gaoji
that
.
personageList
=
that
.
personageList_gaoji
that
.
toollist
=
that
.
toollist_gaoji
return
false
}
else
{
that
.
credit
=
user
.
creditScore
...
...
@@ -660,22 +662,22 @@
type
:
that
.
type
}).
then
(
res
=>
{
if
(
res
.
code
==
200
)
{
that
.
earningsList_dianke
[
0
].
others
=
'¥'
+
res
.
data
.
spotIncome
//现货收益
that
.
earningsList_dianke
[
1
].
others
=
'¥'
+
res
.
data
.
intermediateIncome
//居间收益
that
.
earningsList_dianke
[
2
].
others
=
'¥'
+
res
.
data
.
commissionIncome
//佣金收益
that
.
earningsList_dianke
[
3
].
others
=
'¥'
+
res
.
data
.
stockIntermediaryIncome
//存量居间收益
that
.
earningsList_dianke
[
4
].
others
=
'¥'
+
res
.
data
.
pendingIncome
//服务费收益
that
.
earningsList_dianke
[
5
].
others
=
'¥'
+
res
.
data
.
pendingIncome
//待确认收益
that
.
earningsList_gaoji
[
0
].
others
=
'¥'
+
res
.
data
.
corporateDiscountAmount
//企业优惠收益
that
.
earningsList_gaoji
[
1
].
others
=
'¥'
+
res
.
data
.
spotIncome
//现货收益
that
.
earningsList_gaoji
[
2
].
others
=
'¥'
+
res
.
data
.
pendingIncome
//待确认收益
that
.
earningsList_zhongji
[
0
].
others
=
'¥'
+
res
.
data
.
corporateDiscountAmount
//企业优惠收益
that
.
earningsList_zhongji
[
1
].
others
=
'¥'
+
res
.
data
.
spotIncome
//现货认收益
that
.
earningsList_zhongji
[
2
].
others
=
'¥'
+
res
.
data
.
pendingIncome
//待确认收益
that
.
earningsList_putong
[
0
].
others
=
'¥'
+
res
.
data
.
corporateDiscountAmount
//企业优惠收益
that
.
earningsList_putong
[
1
].
others
=
'¥'
+
res
.
data
.
pendingIncome
//待确认收益
that
.
earningsList_cunliang
[
0
].
others
=
'¥'
+
res
.
data
.
corporateDiscountAmount
//企业优惠收益
that
.
earningsList_cunliang
[
1
].
others
=
'¥'
+
res
.
data
.
pendingIncome
//待确认收益
that
.
earningsList_dianke
[
0
].
others
=
res
.
data
.
spotIncome
//现货收益
that
.
earningsList_dianke
[
1
].
others
=
res
.
data
.
intermediateIncome
//居间收益
that
.
earningsList_dianke
[
2
].
others
=
res
.
data
.
commissionIncome
//佣金收益
that
.
earningsList_dianke
[
3
].
others
=
res
.
data
.
stockIntermediaryIncome
//存量居间收益
that
.
earningsList_dianke
[
4
].
others
=
res
.
data
.
pendingIncome
//服务费收益
that
.
earningsList_dianke
[
5
].
others
=
res
.
data
.
pendingIncome
//待确认收益
that
.
earningsList_gaoji
[
0
].
others
=
res
.
data
.
corporateDiscountAmount
//企业优惠收益
that
.
earningsList_gaoji
[
1
].
others
=
res
.
data
.
spotIncome
//现货收益
that
.
earningsList_gaoji
[
2
].
others
=
res
.
data
.
pendingIncome
//待确认收益
that
.
earningsList_zhongji
[
0
].
others
=
res
.
data
.
corporateDiscountAmount
//企业优惠收益
that
.
earningsList_zhongji
[
1
].
others
=
res
.
data
.
spotIncome
//现货认收益
that
.
earningsList_zhongji
[
2
].
others
=
res
.
data
.
pendingIncome
//待确认收益
that
.
earningsList_putong
[
0
].
others
=
res
.
data
.
corporateDiscountAmount
//企业优惠收益
that
.
earningsList_putong
[
1
].
others
=
res
.
data
.
pendingIncome
//待确认收益
that
.
earningsList_cunliang
[
0
].
others
=
res
.
data
.
corporateDiscountAmount
//企业优惠收益
that
.
earningsList_cunliang
[
1
].
others
=
res
.
data
.
pendingIncome
//待确认收益
}
})
},
...
...
pagesA/agreement/protocol/PrivacyProtocol.vue
浏览文件 @
95788a8d
差异被折叠。
点击展开。
static/util/api.js
浏览文件 @
95788a8d
const
erp
=
erp
||
{};
//wxb21370ac25ee51b0,//wx45bb68de16ddddb7
//
const DOMAIN = 'http://192.168.1.107:9099/'; // 峰煜
const
DOMAIN
=
'https://dev.diaosaas.com/diaoyun/'
//测试
const
DOMAIN
=
'http://192.168.1.107:9099/'
;
// 峰煜
//
const DOMAIN = 'https://dev.diaosaas.com/diaoyun/' //测试
// const DOMAIN = 'http://192.168.1.178:9099/' // 国禄
// const DOMAIN = 'http://192.168.1.197:9099/' // 志就
// const DOMAIN = 'https://fire.huoshitou.net/diaoyun/' // 正式
...
...
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
浏览文件 @
95788a8d
差异被折叠。
点击展开。
unpackage/dist/dev/.sourcemap/mp-weixin/pages/group/GroupCompany.js.map
浏览文件 @
95788a8d
差异被折叠。
点击展开。
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/.sourcemap/mp-weixin/pagesA/agreement/protocol/PrivacyProtocol.js.map
浏览文件 @
95788a8d
差异被折叠。
点击展开。
unpackage/dist/dev/mp-weixin/common/vendor.js
浏览文件 @
95788a8d
...
...
@@ -16505,8 +16505,8 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
"use strict"
;
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
=
'https://dev.diaosaas.com/diaoyun/'
;
//测试
var
DOMAIN
=
'http://192.168.1.107:9099/'
;
// 峰煜
// const DOMAIN = 'https://dev.diaosaas.com/diaoyun/'
//测试
// const DOMAIN = 'http://192.168.1.178:9099/' // 国禄
// const DOMAIN = 'http://192.168.1.197:9099/' // 志就
// 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.
getBasicCreditScore
:
function
getBasicCreditScore
()
{
var
that
=
this
;
(
0
,
_fun
.
get
)(
_api
.
default
.
getBasicCreditScore
,
{
type
:
1
,
type
:
2
,
userId
:
this
.
electricId
}).
then
(
function
(
res
)
{
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:
if
(
!
user
)
{
that
.
tabbarIndex
=
2
;
that
.
isuser
=
false
;
that
.
contractA
=
true
;
that
.
earningsList
=
that
.
earningsList_gaoji
;
that
.
personageList
=
that
.
personageList_gaoji
;
that
.
toollist
=
that
.
toollist_gaoji
;
return
false
;
}
else
{
that
.
credit
=
user
.
creditScore
;
...
...
@@ -792,22 +794,22 @@ var app = getApp();var _default = { data: function data() {return { contractNum:
type
:
that
.
type
}).
then
(
function
(
res
)
{
if
(
res
.
code
==
200
)
{
that
.
earningsList_dianke
[
0
].
others
=
'¥'
+
res
.
data
.
spotIncome
;
//现货收益
that
.
earningsList_dianke
[
1
].
others
=
'¥'
+
res
.
data
.
intermediateIncome
;
//居间收益
that
.
earningsList_dianke
[
2
].
others
=
'¥'
+
res
.
data
.
commissionIncome
;
//佣金收益
that
.
earningsList_dianke
[
3
].
others
=
'¥'
+
res
.
data
.
stockIntermediaryIncome
;
//存量居间收益
that
.
earningsList_dianke
[
4
].
others
=
'¥'
+
res
.
data
.
pendingIncome
;
//服务费收益
that
.
earningsList_dianke
[
5
].
others
=
'¥'
+
res
.
data
.
pendingIncome
;
//待确认收益
that
.
earningsList_gaoji
[
0
].
others
=
'¥'
+
res
.
data
.
corporateDiscountAmount
;
//企业优惠收益
that
.
earningsList_gaoji
[
1
].
others
=
'¥'
+
res
.
data
.
spotIncome
;
//现货收益
that
.
earningsList_gaoji
[
2
].
others
=
'¥'
+
res
.
data
.
pendingIncome
;
//待确认收益
that
.
earningsList_zhongji
[
0
].
others
=
'¥'
+
res
.
data
.
corporateDiscountAmount
;
//企业优惠收益
that
.
earningsList_zhongji
[
1
].
others
=
'¥'
+
res
.
data
.
spotIncome
;
//现货认收益
that
.
earningsList_zhongji
[
2
].
others
=
'¥'
+
res
.
data
.
pendingIncome
;
//待确认收益
that
.
earningsList_putong
[
0
].
others
=
'¥'
+
res
.
data
.
corporateDiscountAmount
;
//企业优惠收益
that
.
earningsList_putong
[
1
].
others
=
'¥'
+
res
.
data
.
pendingIncome
;
//待确认收益
that
.
earningsList_cunliang
[
0
].
others
=
'¥'
+
res
.
data
.
corporateDiscountAmount
;
//企业优惠收益
that
.
earningsList_cunliang
[
1
].
others
=
'¥'
+
res
.
data
.
pendingIncome
;
//待确认收益
that
.
earningsList_dianke
[
0
].
others
=
res
.
data
.
spotIncome
;
//现货收益
that
.
earningsList_dianke
[
1
].
others
=
res
.
data
.
intermediateIncome
;
//居间收益
that
.
earningsList_dianke
[
2
].
others
=
res
.
data
.
commissionIncome
;
//佣金收益
that
.
earningsList_dianke
[
3
].
others
=
res
.
data
.
stockIntermediaryIncome
;
//存量居间收益
that
.
earningsList_dianke
[
4
].
others
=
res
.
data
.
pendingIncome
;
//服务费收益
that
.
earningsList_dianke
[
5
].
others
=
res
.
data
.
pendingIncome
;
//待确认收益
that
.
earningsList_gaoji
[
0
].
others
=
res
.
data
.
corporateDiscountAmount
;
//企业优惠收益
that
.
earningsList_gaoji
[
1
].
others
=
res
.
data
.
spotIncome
;
//现货收益
that
.
earningsList_gaoji
[
2
].
others
=
res
.
data
.
pendingIncome
;
//待确认收益
that
.
earningsList_zhongji
[
0
].
others
=
res
.
data
.
corporateDiscountAmount
;
//企业优惠收益
that
.
earningsList_zhongji
[
1
].
others
=
res
.
data
.
spotIncome
;
//现货认收益
that
.
earningsList_zhongji
[
2
].
others
=
res
.
data
.
pendingIncome
;
//待确认收益
that
.
earningsList_putong
[
0
].
others
=
res
.
data
.
corporateDiscountAmount
;
//企业优惠收益
that
.
earningsList_putong
[
1
].
others
=
res
.
data
.
pendingIncome
;
//待确认收益
that
.
earningsList_cunliang
[
0
].
others
=
res
.
data
.
corporateDiscountAmount
;
//企业优惠收益
that
.
earningsList_cunliang
[
1
].
others
=
res
.
data
.
pendingIncome
;
//待确认收益
}
});
},
...
...
unpackage/dist/dev/mp-weixin/pages/myInfo/myInfo.wxml
浏览文件 @
95788a8d
差异被折叠。
点击展开。
unpackage/dist/dev/mp-weixin/pagesA/agreement/protocol/PrivacyProtocol.js
浏览文件 @
95788a8d
...
...
@@ -129,6 +129,248 @@ __webpack_require__.r(__webpack_exports__);
/*! no static exports found */
/***/
(
function
(
module
,
exports
)
{
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
...
...
unpackage/dist/dev/mp-weixin/pagesA/agreement/protocol/PrivacyProtocol.wxml
浏览文件 @
95788a8d
差异被折叠。
点击展开。
unpackage/dist/dev/mp-weixin/pagesA/agreement/protocol/PrivacyProtocol.wxss
浏览文件 @
95788a8d
...
...
@@ -25,15 +25,18 @@
/* 透明度 */
/* 文章场景相关 */
.PrivacyProtocol {
padding
-top
: 32rpx;
padding: 32rpx;
width: 100%;
height: 100%;
background-color: #f4f5f7;
}
.PrivacyProtocol .PrivacyProtocol_box {
padding: 56rpx;
background: #fff;
font-size: 28rpx;
color: #333;
.PrivacyProtocol view {
font-size: 24rpx;
margin: 16rpx 0;
}
.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 DOMAIN = 'http://192.168.1.107:9099/'; // 峰煜
const
DOMAIN
=
'https://dev.diaosaas.com/diaoyun/'
//测试
const
DOMAIN
=
'http://192.168.1.107:9099/'
;
// 峰煜
//
const DOMAIN = 'https://dev.diaosaas.com/diaoyun/' //测试
// const DOMAIN = 'http://192.168.1.178:9099/' // 国禄
// const DOMAIN = 'http://192.168.1.197:9099/' // 志就
// const DOMAIN = 'https://fire.huoshitou.net/diaoyun/' // 正式
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论