Skip to content

C
CFFP-HB
Commit f1d331dd by yuzhenWang
Options

Merge branch 'wyz' into 'test' 

Wyz

See merge request !117
parents 92f06acf 003351f4
Showing with 74 additions and 17 deletions
api/api.ts
import request from "../util/request";
import {baseURL,apiURL,cffpURL,sfpUrl,imgUrl,scrmUrl} from "../environments/environment";
import {baseURL,apiURL,cffpURL,sfpUrl,imgUrl,scrmUrl, csfUrl
} from "../environments/environment";
export default {
//查看token是否已经失效
......@@ -471,4 +472,12 @@ export default {
statusBusinessCard(params) {
return request(`${apiURL}/business-card/cards/views`, 'POST', params)
},
//薪资信息
salaryCondition(params) {
return request(`${csfUrl}/csf/api/salary/condition/list`, 'POST', params)
},
//薪资信息
salaryDetail(salaryBizId) {
return request(`${csfUrl}/csf/api/salary/detail?salaryBizId=${salaryBizId}`,'GET')
},
}
components/commonTimePicker/commonTimePicker.vue
......@@ -4,13 +4,13 @@
<view class="" v-if="initDate">
<text style="font-size: 30rpx;">{{initDate}}</text>
<text v-if="iconDirection == 'down'" class="iconfont icon-xiajiantou iconStyle" :style="{color: iconColor || ''}"></text>
<text v-if="iconDirection == 'right'" class="iconfont icon-youjiantou iconStyle"></text>
<text v-if="iconDirection == 'right'" class="iconfont icon-youjiantou iconStyle" :style="{color: iconColor || ''}"></text>
</view>
<view class="emptyTxt" v-else>
<text v-if="startTxt" :style="{fontSize: placeholderSize}">{{startTxt}}</text>
<text v-if="endTxt" :style="{fontSize: placeholderSize}">{{endTxt}}</text>
<text v-if="iconDirection == 'down'" class="iconfont icon-xiajiantou iconStyle"></text>
<text v-if="iconDirection == 'right'" class="iconfont icon-youjiantou iconStyle"></text>
<text v-if="iconDirection == 'down'" class="iconfont icon-xiajiantou iconStyle" :style="{color: iconColor || ''}"></text>
<text v-if="iconDirection == 'right'" class="iconfont icon-youjiantou iconStyle" :style="{color: iconColor || ''}"></text>
</view>
</view>
<uni-popup ref="timePopup" type="bottom" :maskClick="false">
......@@ -105,6 +105,7 @@ export default {
yearEnd: {
type: Number,
},
},
data() {
const date = new Date();
......@@ -318,6 +319,9 @@ export default {
}
.timeTitle {
font-size: 35rpx;
.iconStyle{
margin-left: 5rpx;
}
.emptyTxt {
color: gray;
font-size: 31rpx;
......
environments/environment.ts
......@@ -9,7 +9,8 @@ const dev = {
sfp_url:'https://mdev.anjibao.cn/sfpApi',
img_url:'https://mdev.zuihuibi.cn',
scrm_url:'https://mdev.zuihuibi.cn',
file_query_url:'https://mdev.zuihuibi.cn'
file_query_url:'https://mdev.zuihuibi.cn',
csf_url:'http://139.224.145.34:9002',
}
const stage = {
base_url:'https://mstage.zuihuibi.cn',
......@@ -29,7 +30,8 @@ const prod = {
sfp_url:'https://hoservice.ydhomeoffice.cn/hoserviceApi',
img_url:'https://app.ydhomeoffice.cn',
scrm_url:'https://m.zuihuibi.cn',
file_query_url:'https://m.zuihuibi.cn'
file_query_url:'https://m.zuihuibi.cn',
csf_url:'https://center.supguard.cn',
}
// companyType: '1', cffp
// companyType: '2', appYdhomeoffice
......@@ -63,6 +65,7 @@ let sfpUrl = config[env].sfp_url;
let imgUrl = config[env].img_url;
let scrmUrl = config[env].scrm_url;
let fileQueryErl = config[env].file_query_url;
let csfUrl = config[env].csf_url;
export{
baseURL,
......@@ -74,5 +77,6 @@ export{
env,
imgUrl,
scrmUrl,
fileQueryErl
fileQueryErl,
csfUrl
}
\ No newline at end of file
pages.json
......@@ -620,6 +620,13 @@
{
"navigationBarTitleText" : "我的名片"
}
},
{
"path" : "salary/salaryList",
"style" :
{
"navigationBarTitleText" : "积分明细"
}
}
// {
// "path" : "ticket/unUsed",
......
pages/personalCenter/personalCenter.vue
......@@ -339,10 +339,9 @@
children: [{
title: '积分明细',
icon: 'icon-yongjin',
link: '/pages/personalCenter/helpCenter',
isOpen: false,
link: '/myPackageA/salary/salaryList',
isOpen: true,
isShow: true,
islogin: true
}],
},
{
......@@ -625,7 +624,6 @@
if (item.kefu) {
// 现在还没转化成小程序，暂时放在这
// #ifdef MP-WEIXIN
console.log('MP-WEIXIN====')
dataHandling.pocessTracking(
'咨询客服',
`用户咨询客服`,
......
static/font1/demo_index.html
......@@ -55,6 +55,12 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont">&#xe634;</span>
<div class="name">上箭头</div>
<div class="code-name">&amp;#xe634;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe875;</span>
<div class="name">盾牌,安全,保护</div>
<div class="code-name">&amp;#xe875;</div>
......@@ -522,9 +528,9 @@
<pre><code class="language-css"
>@font-face {
font-family: 'iconfont';
src: url('iconfont.woff2?t=1773642495782') format('woff2'),
url('iconfont.woff?t=1773642495782') format('woff'),
url('iconfont.ttf?t=1773642495782') format('truetype');
src: url('iconfont.woff2?t=1782367516117') format('woff2'),
url('iconfont.woff?t=1782367516117') format('woff'),
url('iconfont.ttf?t=1782367516117') format('truetype');
}
</code></pre>
<h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
......@@ -551,6 +557,15 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont icon-shangjiantou"></span>
<div class="name">
上箭头
</div>
<div class="code-name">.icon-shangjiantou
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-shield"></span>
<div class="name">
盾牌,安全,保护
......@@ -1254,6 +1269,14 @@
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-shangjiantou"></use>
</svg>
<div class="name">上箭头</div>
<div class="code-name">#icon-shangjiantou</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-shield"></use>
</svg>
<div class="name">盾牌,安全,保护</div>
......
static/font1/iconfont.css
@font-face {
font-family: "iconfont"; /* Project id 4933433 */
src: url('iconfont.woff2?t=1773642495782') format('woff2'),
url('iconfont.woff?t=1773642495782') format('woff'),
url('iconfont.ttf?t=1773642495782') format('truetype');
src: url('iconfont.woff2?t=1782367516117') format('woff2'),
url('iconfont.woff?t=1782367516117') format('woff'),
url('iconfont.ttf?t=1782367516117') format('truetype');
}
.iconfont {
......@@ -13,6 +13,10 @@
-moz-osx-font-smoothing: grayscale;
}
.icon-shangjiantou:before {
content: "\e634";
}
.icon-shield:before {
content: "\e875";
}
......
static/font1/iconfont.js
This source diff could not be displayed because it is too large. You can view the blob instead.
static/font1/iconfont.json
......@@ -6,6 +6,13 @@
"description": "",
"glyphs": [
{
"icon_id": "9021525",
"name": "上箭头",
"font_class": "shangjiantou",
"unicode": "e634",
"unicode_decimal": 58932
},
{
"icon_id": "18165054",
"name": "盾牌,安全,保护",
"font_class": "shield",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment