Skip to content

M
member
Commit 2d4707cd by member
Options

测试上传图片组建

parent 89367355
Showing with 388 additions and 132 deletions
member.zip 0 → 100644
File added
package.json
......@@ -17,14 +17,16 @@
"@gic-test/vue-gic-card": "^1.0.35",
"@gic-test/vue-gic-footer": "^1.0.9",
"@gic-test/vue-gic-header": "^1.3.31",
"@gic-test/vue-gic-people": "^1.2.11",
"@gic-test/vue-gic-people": "^1.2.12",
"@gic-test/vue-gic-store": "^1.0.38",
"@gic-test/vue-gic-store-group": "^1.0.4",
"@gic-test/vue-gic-store-linkage": "^1.0.2",
"@gic-test/vue-gic-upload-image": "^1.0.5",
"node-sass": "^4.9.3",
"packele": "^1.0.2",
"sass": "^1.14.0",
"sass-loader": "^7.1.0",
"sycodecomponent": "^1.0.2",
"viser-vue": "^2.3.0",
"vue": "^2.5.2",
"vue-router": "^3.0.1",
......
src/common/navbar/navbar.vue
......@@ -49,7 +49,7 @@
font-weight 700
.wechat-setting
float right
padding 8px 20px
padding 8px 15px
text-align right
line-height 1
border 1px solid #dcdfe6
......@@ -57,7 +57,12 @@
box-sizing border-box
font-size 14px
border-radius 4px
font-weight initial
cursor pointer
&:hover
color #409eff
border-color #c6e2ff
background-color #ecf5ff
.boxshow
border-bottom 1px solid #e4e7ed
box-shadow 5px -1px 5px #dfdfdf
......
src/components/achievement/achievement_interaction.vue
......@@ -65,7 +65,7 @@
<vue-gic-footer></vue-gic-footer>
</div>
<!--编辑奖励-->
<el-dialog title="编辑奖励" :visible.sync="dialogRewardVisible">
<el-dialog title="编辑奖励" :visible.sync="dialogRewardVisible" @closeDialog="closeDialog">
<el-form :model="rewardForm" >
<el-form-item label="奖励形式" label-width="100px" prop="achievementRewardType">
<span class="el-radio__input" @click="selectRewardType(1)" :class="rewardForm.achievementRewardType == 1 ? 'is-checked' : ''"><span class="el-radio__inner"></span>
......@@ -89,7 +89,7 @@
</div>
</el-dialog>
<!--编辑奖励-end-->
<vue-gic-card :projectName="projectName" :cardLimit="cardLimit" :cardType="cardType" :showCardDialog="showCardDialog"
<vue-gic-card :projectName="projectName" :cardLimit="cardLimit" :cardType="cardType" :showCardDialog="showCardDialog"
@selectCard="selectCard"></vue-gic-card>
</div>
</template>
......@@ -104,6 +104,8 @@
name: "achievement",
data() {
return {
prizeflag: false,
integral: '',
rewardPrize: '',
rewardNameFlag: false,
navpath: [
......@@ -190,7 +192,7 @@
updateType: 2,
achievementRewardType: this.rewardForm.achievementRewardType,
rewardValue: this.rewardForm.rewardValue,
rewardName: '积分××'
rewardName: this.integral
}
}
if(this.rewardForm.achievementRewardType === 2) {
......@@ -217,21 +219,31 @@
},
selectCard(val) {
this.rewardForm.rewardReferId = val.coupCardId;
this.rewardForm.rewardName = (val && val.cardName) ? val.cardName : '';
this.rewardPrize = '重新选择';
this.showCardDialog = false;
this.rewardForm.rewardReferId = val.coupCardId;
},
selectRewardType(type) {
if(type === 1) {
if (!this.prizeflag) {
this.rewardPrize = '重新选择';
}
this.prizeflag = true;
this.rewardForm.achievementRewardType = type;
}
if(type === 2) {
this.rewardForm.achievementRewardType = type;
this.rewardNameFlag = true;
this.rewardForm.rewardName = '选择卡券';
if (!this.prizeflag) {
this.rewardPrize = '选择卡券';
this.prizeflag = true;
}
}
},
closeDialog() {
this.prizeflag = false;
},
eidtRewardValue(row) {
this.rewardForm.achievementEnterpriseRankId = null;
this.rewardForm.rewardValue = null;
......@@ -240,6 +252,7 @@
this.rewardForm.achievementEnterpriseRankId = row.achievementEnterpriseRankId;
this.rewardForm.rewardValue = row.rewardValue;
this.rewardForm.rewardName = row.rewardName;
this.integral = row.rewardName;
this.rewardForm.achievementRewardType = row.achievementRewardType;
this.rewardForm.rewardReferId = row.rewardReferId;
if(this.rewardForm.achievementRewardType === 1) {
......
src/components/achievement/achievement_sale.vue
......@@ -61,7 +61,7 @@
<vue-gic-footer></vue-gic-footer>
</div>
<!--编辑奖励-->
<el-dialog title="编辑奖励" :visible.sync="dialogRewardVisible">
<el-dialog title="编辑奖励" :visible.sync="dialogRewardVisible" @close="closeDialog">
<el-form :model="rewardForm" >
<el-form-item label="奖励形式" label-width="100px" prop="achievementRewardType">
<span class="el-radio__input" @click="selectRewardType(1)" :class="rewardForm.achievementRewardType == 1 ? 'is-checked' : ''"><span class="el-radio__inner"></span>
......@@ -69,14 +69,16 @@
<span><el-input-number class="numberinput" v-model="rewardForm.rewardValue" controls-position="right" :min="0" :max="100000"></el-input-number> 积分</span>
</el-form-item>
<el-form-item label="" label-width="100px" prop="achievementRewardType">
<div @click="selectRewardType(2)">
<span class="el-radio__input" :class="rewardForm.achievementRewardType == 2 ? 'is-checked' : ''"><span class="el-radio__inner"></span>
</span><span class="el-radio__label">奖励卡券</span>
<div class="rewardname" style="color: #409EFF; cursor: pointer;" v-if="rewardNameFlag" @click="chooseCard">
<span>{{rewardPrize}}</span>
<div @click="selectRewardType(2)">
<span class="el-radio__input" :class="rewardForm.achievementRewardType == 2 ? 'is-checked' : ''">
<span class="el-radio__inner"></span>
</span>
<span class="el-radio__label">奖励卡券</span>
</div>
<div class="rewardname" style="color: #409EFF; cursor: pointer;" v-show="rewardNameFlag" @click="chooseCard">
<span >{{rewardPrize}}</span>
{{rewardForm.rewardName}}
</div>
</div>
</div>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -100,6 +102,7 @@
name: "achievement",
data() {
return {
prizeflag: false,
switchValue: false,
rewardPrize: '',
rewardNameFlag: false,
......@@ -216,7 +219,7 @@
updateType: 2,
achievementRewardType: this.rewardForm.achievementRewardType,
rewardValue: this.rewardForm.rewardValue,
rewardName: '积分××'
rewardName: this.integral
}
}
if(this.rewardForm.achievementRewardType === 2) {
......@@ -251,18 +254,28 @@
},
selectRewardType(type) {
if(type === 1) {
if (!this.prizeflag) {
this.rewardPrize = '重新选择';
}
this.prizeflag = true;
this.rewardForm.achievementRewardType = type;
}
if(type === 2) {
this.rewardForm.achievementRewardType = type;
this.rewardNameFlag = true;
this.rewardForm.rewardName = '选择卡券';
if (!this.prizeflag) {
this.rewardPrize = '选择卡券';
this.prizeflag = true;
}
}
},
// 选择卡券 弹框
chooseCard() {
this.showCardDialog = true;
},
closeDialog() {
this.prizeflag = false;
},
// rewardForm.rewardReferId
eidtRewardValue(row) {
this.rewardForm.rewardValue = null;
......@@ -270,12 +283,13 @@
this.dialogRewardVisible = true;
this.rewardForm.achievementEnterpriseRankId = row.achievementEnterpriseRankId;
this.rewardForm.rewardValue = row.rewardValue;
this.rewardForm.rewardName = row.rewardName;
this.rewardForm.rewardName = row.rewardName; // 积分名称
this.integral = row.rewardName;
this.rewardForm.achievementRewardType = row.achievementRewardType;
this.rewardForm.rewardReferId = row.rewardReferId;
console.log(this.rewardForm.rewardReferId);
if(this.rewardForm.achievementRewardType === 1) {
this.rewardForm.rewardName = '';
this.rewardNameFlag = false;
}
if (this.rewardForm.achievementRewardType === 2) {
this.rewardPrize = '重新选择';
......@@ -405,7 +419,7 @@
<style lang="stylus" scoped>
.rewardname
margin-left 24px
margin-left 28px
line-height 0
// 会员成就
.achievement
......
src/components/axios/url.js
......@@ -62,5 +62,6 @@ export default {
enterpriseInfo: '/api-member/enterprise-info',//获取企业配置信息
posInfo: '/api-member/member-load-member-pos-info',//pos会员详情 会员信息
posBaseDetail: '/api-member/member-load-update-pos-base-detail',//修改pos会员基本信息
batchUpdateStore: '/api-member/batch-update-members-store' // 回收站修改主门店
batchUpdateStore: '/api-member/batch-update-members-store', // 回收站修改主门店
getStorePicture: '/api-member/enterprise-info' // 获取企业配置信息
}
src/components/labelmanager/labelmanager.vue
......@@ -28,7 +28,8 @@
v-model="item.inputVal"
:ref="'saveTag' + index"
size="small"
@keyup.enter.native="handleInputConfirm(item)"
@keyup.enter.native="handleInputConfirm(item, index, $event)"
@blur="handleInputConfirm(item, index, $event)"
></el-input>
<el-button size="small" v-else class="grouptag el-tag" @click="showInput(item, index)">+ 添加标签</el-button>
</div>
......@@ -85,6 +86,7 @@
name: "labelmanager",
data() {
return {
addTagCount: 0,
bodyHeight: document.body.clientHeight || document.documentElement.clientHeight,
collapseFlag: false,
leftModulesName: '会员标签',
......@@ -129,21 +131,29 @@
});
},
// 新加标签
handleInputConfirm(item) {
handleInputConfirm(item, i, event) {
let inputValue = item.inputVal;
// 不能为空
if (!inputValue) {
return;
}
doFetch(url.insertSonTag, {
if (inputValue) {
// item.inputVal = '';
// sy 不能重复输入
let hasSonTag = this.tagList[i].sonList.every(el => {
return inputValue !== el.tagName;
});
if (!hasSonTag) {
this.$message.warning('已存在该标签名，不能重复添加！');
return;
}
doFetch(url.insertSonTag, {
tagName: inputValue,
pTagId: this.curpTagId
}).then(res => {
if(res.data.errorCode === 0) {
checkSuccess();
this.inputVisible = false;
this.inputValue = '';
item.inputVal = '';
this.getLabel();
return false;
}else {
checkFalse(res.data.message);
}
......@@ -152,6 +162,7 @@
checkStatus(err);
this.dialogAddFormVisible = false;
})
}
},
AddTagType() {
this.labelForm.tagName = '';
......@@ -162,6 +173,14 @@
this.$refs['addForm'].validate((valid) => {
return !valid
})
// sy 不允许标签类型名重复
let hasTag = this.tagList.every(el => {
return this.labelForm.tagName !== el.tagName;
});
if (!hasTag) {
this.$message.warning('已存在该标签类型');
return;
}
if(this.labelForm.tagName.trim() && this.labelForm.tagDescribe.trim()) {
doFetch(url.insertParentTag,{
tagName: this.labelForm.tagName,
......
src/components/memberlist/memberReturn.js
......@@ -5,6 +5,7 @@ import NavPath from "@/common/navbar/navbar.vue";
import url from '../../components/axios/url'
import {checkFalse, checkStatus, checkSuccess} from "../../../static/js/checkStatus";
import { getParamsByName, formatLongTime, paddingBorth } from '@/utils/utils';
import { mapState } from 'vuex';
let showFields = [];
let qs = require('qs');
......@@ -137,6 +138,11 @@ export default {
integralFlag: ''
}
},
computed: {
...mapState([
'storeImageUrl'
])
},
filters: {
formatField: function (val) {
let tempVal = val;
......@@ -868,7 +874,8 @@ export default {
sex: ele.sex == 0 ? '性别未知' : ele.sex == 1 ? '男' : '女',
age: !!ele.age ? ele.age : '年龄未知',
cardNo: !!ele.cardNo ? ele.cardNo : '无会员卡',
mainStoreName: !!ele.mainStoreName ? ele.mainStoreName : '主门店未知'
mainStoreName: !!ele.mainStoreName ? ele.mainStoreName : '主门店未知',
thirdImgUrl: ele.thirdImgUrl ? ele.thirdImgUrl : this.storeImageUrl
}));
this.page.currentPage = res.data.result.page.currentPage;
this.page.totalCount = res.data.result.page.totalCount;
......@@ -898,11 +905,16 @@ export default {
}
},
created() {
if (!this.storeImageUrl) {
this.$store.dispatch('getStorePicture');
}
this.getProcessList();
this.initialize();
this.getAjaxMembers();
this.$store.commit('mutations-slide',false);
},
beforeMount() {
this.getAjaxMembers();
},
mounted() {
console.log(this.toggleTag);
},
......
src/components/posmembers/posmemberDetail.vue
......@@ -346,6 +346,7 @@
font-size 14px
&-leftitem
padding-left 20px
color #909399
&-rightcontent
margin-right 20px
width 150px
......
src/components/posmembers/posmembers.js
......@@ -5,6 +5,7 @@ import { doFetch, doFetchqs } from "../../components/axios/api";
import url from '../../components/axios/url'
import { checkFalse, checkStatus, checkSuccess } from "../../../static/js/checkStatus";
import { getParamsByName, formatLongTime, paddingBorth } from '@/utils/utils';
import { mapState } from 'vuex';
let showFields = [];
let qs = require('qs');
......@@ -135,6 +136,11 @@ export default {
toggleTag: false
}
},
computed: {
...mapState([
'storeImageUrl'
])
},
filters: {
formatTimeYMD(val) {
return val != '--' ? val.split(' ')[0] : '--';
......@@ -882,7 +888,8 @@ export default {
cancelAttentionTime: ele.cancelAttentionTime != -1 ? formatLongTime(ele.cancelAttentionTime, 2) : '--', // 取关时间
attentionTime: ele.attentionTime != -1 ? formatLongTime(ele.attentionTime, 1) : '--', // 关注时间
crateCardDateString: ele.crateCardDateString != -1 ? formatLongTime(ele.crateCardDateString, 1) : '--', // 开卡
birthdayMD: ele.birthdayMD != 0 ? paddingBorth(ele.birthdayMD) : '--' // 生日补全
birthdayMD: ele.birthdayMD != 0 ? paddingBorth(ele.birthdayMD) : '--', // 生日补全
thirdImgUrl: ele.thirdImgUrl ? ele.thirdImgUrl : this.storeImageUrl
}));
this.page.currentPage = res.data.result.page.currentPage;
this.page.totalCount = res.data.result.page.totalCount;
......@@ -909,10 +916,15 @@ export default {
}
},
created() {
if (!this.storeImageUrl) {
this.$store.dispatch('getStorePicture');
}
this.getProcessList();
this.phoneNameCard = !!sessionStorage.getItem('posphoneNameCard') ? sessionStorage.getItem('posphoneNameCard') : '';
this.page.currentPage = !!sessionStorage.getItem('poscurrentPage') ? sessionStorage.getItem('poscurrentPage') : 1;
this.getEnterpriseInfo();
},
beforeMount() {
this.getAjaxMembers();
},
components: {
......
src/components/posmembers/posmembers.vue
......@@ -194,12 +194,8 @@
{{ scope.row.cardNo }}
</span>
<div v-else-if="item == 'frozenStatus'">
<span class="dm-status--success" v-if="scope.row.frozenStatus == 0">
正常
</span>
<span class="dm-status--warning" v-if="scope.row.frozenStatus == 1">
冻结
</span>
<span class="dm-status--success" v-if="scope.row.frozenStatus == 0">正常</span>
<span class="dm-status--warning" v-if="scope.row.frozenStatus == 1">冻结</span>
</div>
</template>
</el-table-column>
......@@ -320,12 +316,8 @@
{{ scope.row.cardNo }}
</span>
<div v-else-if="item == 'frozenStatus'">
<span class="dm-status--success" v-if="scope.row.frozenStatus == 0">
正常
</span>
<span class="dm-status--warning" v-if="scope.row.frozenStatus == 1">
冻结
</span>
<span class="dm-status--success" v-if="scope.row.frozenStatus == 0">正常</span>
<span class="dm-status--warning" v-if="scope.row.frozenStatus == 1">冻结</span>
</div>
</template>
</el-table-column>
......@@ -521,7 +513,6 @@
color #409eff
.gic-people
position relative
z-index 0
margin-bottom 16px
min-height 100px
background-color #fff
......
src/components/wechatmembers/frozenList.vue
......@@ -25,10 +25,7 @@
<span @click="selectAllmultipleList" class="multiple-all pointer" v-else>取消勾选</span>
</div>
<div class="right-btn">
<el-button type="primary" @click="unFrozen">
<router-link to="/frozenList/frozenMember" style="color: #fff">冻结会员</router-link>
</el-button>
<router-link to="/frozenList/frozenMember" class="inner-btn-link">冻结会员</router-link>
<el-button type="primary" @click="unFrozen">批量解冻</el-button>
</div>
</div>
......@@ -156,8 +153,6 @@
<div class="foot-add">
<vue-gic-footer></vue-gic-footer>
</div>
</div>
</template>
......@@ -166,6 +161,7 @@ import NavPath from "@/common/navbar/navbar.vue";
import { doFetch } from "@/components/axios/api";
import { formatLongTime } from "@/utils/utils";
import url from "@/components/axios/url";
import { mapState } from 'vuex';
let qs = require("qs");
......@@ -214,18 +210,28 @@ export default {
}
};
},
computed: {
...mapState([
'storeImageUrl'
])
},
created() {
if (!this.storeImageUrl) {
this.$store.dispatch('getStorePicture');
}
this.ids = [];
this.keywords = !!sessionStorage.getItem('keywords') ? sessionStorage.getItem('keywords') : '';
this.frozenType = !!sessionStorage.getItem('frozenType') ? sessionStorage.getItem('frozenType') : '';
this.frozenType = !!this.frozenType ? parseInt(this.frozenType, 10) : '';
this.currentPage = !!sessionStorage.getItem('frozenlistcurrentPage') ? Number(sessionStorage.getItem('frozenlistcurrentPage')) : 1;
this.$store.commit('mutations-slide', true);
},
beforeMount() {
this.getList({
pSize: 20,
cPage: 1
});
this.$store.commit('mutations-slide', true);
},
filters: {
formatTimeYMD(val) {
......@@ -285,9 +291,11 @@ export default {
if (res.data.errorCode === 0) {
this.load = false;
if (res.data.result.result) {
this.frozenList = res.data.result.result && res.data.result.result.map(ele => (
{...ele, forzenLastTime: ele.forzenLastTime != -1? formatLongTime(ele.forzenLastTime, 1) : '--'})
);
this.frozenList = res.data.result.result && res.data.result.result.map(ele => ({
...ele,
forzenLastTime: ele.forzenLastTime != -1? formatLongTime(ele.forzenLastTime, 1) : '--',
thirdImgUrl: ele.thirdImgUrl ? ele.thirdImgUrl : this.storeImageUrl
}));
this.total = res.data.result.totalCount;
} else {
this.frozenList = [];
......@@ -514,4 +522,15 @@ export default {
padding: 20px 0
.frozen-list
height 100%
.inner-btn-link
display inline-block
padding 0 16px
margin-right 5px
height 32px
line-height 32px
text-align center
background-color #1890ff
color #fff
font-size 14px
border-radius 4px
</style>
src/components/wechatmembers/frozenMember.vue
......@@ -2,17 +2,17 @@
<div class="frozen-list">
<div class="min100">
<nav-path :navpath="navpath"></nav-path>
<div class="member-container">
<div class="member-forzen-container">
<!--
会员列表
-->
<div class="list" ref="memberlist">
<div class="list" v-if="forzenShow" ref="memberlist">
<div class="switch">
<span>会员列表</span>
<!-- <a class="switch-link">切换为导入模式</a> -->
</div>
<div class="search-box">
<el-input v-model="keywords" placeholder="请输入会员姓名/卡号/手机号" clearable @keyup.enter.native="submit" style="width: 230px;">
<el-input v-model="keywords" placeholder="请输入会员姓名/卡号/手机号码" clearable @keyup.enter.native="submit" style="width: 260px;">
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</el-input>
<!-- <div class="choose-title" v-if="memberList.length == 20">
......@@ -157,7 +157,6 @@
<vue-gic-footer></vue-gic-footer>
</div>
</div>
</template>
......@@ -168,6 +167,7 @@ import { formatLongTime } from '@/utils/utils';
import { checkFalse } from "../../../static/js/checkStatus";
import url from '../../components/axios/url';
import { setTimeout } from 'timers';
import { mapState } from 'vuex';
let qs = require('qs');
......@@ -223,14 +223,32 @@ export default {
}
};
},
beforeMount() {
computed: {
forzenShow() {
return this.$store.state.forzenList;
},
...mapState([
'storeImageUrl'
]),
},
created() {
if (!this.storeImageUrl) {
this.$store.dispatch('getStorePicture');
}
this.$store.commit('mutations-slide', true);
this.$store.commit('forzen-list', false);
// 解决返回来的时候 布局错乱
this.$nextTick(_ => {
this.$store.commit('forzen-list', true);
});
this.memberType = ['微信会员', 'POS会员'];
this.midSelect = [];
},
beforeMount() {
this.getList({
pSize: 10,
cPage: 1
});
this.$store.commit('mutations-slide', true);
},
filters: {
formatTimeYMD(val) {
......@@ -286,7 +304,9 @@ export default {
if (res.data.result.result.length > 0) {
this.frozenList = res.data.result.result.map(ele => ({
...ele,
crateCardDateString: !!ele.crateCardDateString ? formatLongTime(ele.crateCardDateString, 1) : '--'
cardNum: ele.cardNum ? ele.cardNum : '--',
crateCardDateString: !!ele.crateCardDateString ? formatLongTime(ele.crateCardDateString, 1) : '--',
thirdImgUrl: ele.thirdImgUrl ? ele.thirdImgUrl : this.storeImageUrl
})
);
this.total = res.data.result.totalCount;
......@@ -470,7 +490,7 @@ export default {
</script>
<style lang="stylus" scoped>
.member-container
.member-forzen-container
margin 25px 24px 20px
display flex
overflow: hidden
......
src/components/wechatmembers/infoMall.vue
......@@ -65,7 +65,7 @@
<div class="w-15">实付款</div>
<div class="w-15">交易状态</div>
</div>
<div class="mTop20" v-for="(item, index) in memberData" :key="index" v-if="memberData && memberData.length > 0">
<div class="mTop20 member-table-txt" v-for="(item, index) in memberData" :key="index" v-if="memberData && memberData.length > 0">
<div class="orderheader">
<div class="headerinfo">订单编号: {{ item.orderNumber }}</div>
<div class="headerinfo">下单时间：{{ item.createTime }}</div>
......@@ -83,7 +83,7 @@
</div>
<div style="flex: 1;margin-left: 5px">
<div class="font14 break">{{ list.mallProName }}</div>
<div class="mTop10 font14">{{ list.mallProSkuAttr | mallname}}</div>
<div class="mTop10 font14 member-goods-txt">{{ list.mallProSkuAttr | mallname}}</div>
</div>
</div>
</div>
......
src/components/wechatmembers/memberSetting.vue
......@@ -4,13 +4,25 @@
<v-nav :navpath="navpath"></v-nav>
<div class="setting-con">
<div class="setting-container">
<el-switch v-model="value"></el-switch> 是否允许好办通过会员姓名、手机号和卡号搜索查询全品牌会员
<div class="save-btn">
<el-button type="primary" @click="saveSet(2)">保存</el-button>
</div>
<el-switch v-model="value"></el-switch>
<span class="member-setting-txt">是否允许好办通过会员姓名、手机号和卡号搜索查询全品牌会员</span>
</div>
<div class="save-btn">
<el-button type="primary" @click="saveSet(2)">保存</el-button>
</div>
</div>
<div class="upload-image">
<vue-gic-upload-image
:actionUrl="actionUrl"
:imageList="imageList"
:maxImageLength="maxlength"
@uploadOnSuccess="uploadOnSuccess"
@deleteImage="deleteImage">
</vue-gic-upload-image>
</div>
</div>
<div class="footer-box">
<vue-gic-footer></vue-gic-footer>
</div>
......@@ -34,15 +46,33 @@ export default {
{ name: '微信会员', path: '/wechatmembers' },
{ name: '会员设置', path: '' }
],
value: false
value: false,
actionUrl: 'http://gicdev.demogic.com/api-marketing/upload-game-image',
dialogVisible: false,
maxlength: 5,
dialogImageUrl: '',
// 保存的图片集合 负责回显和上传
imageList: [{
url: 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1537965482912&di=a6fc96e35e75b37ef01afa6e2dde925b&imgtype=0&src=http%3A%2F%2Fe.hiphotos.baidu.com%2Fimage%2Fpic%2Fitem%2F2cf5e0fe9925bc316045679855df8db1cb137091.jpg'
}, {
url: 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1537965522381&di=f259f5996e42a9abfac2d0f12798440c&imgtype=0&src=http%3A%2F%2Fb-ssl.duitang.com%2Fuploads%2Fitem%2F201412%2F04%2F20141204221313_uWxYi.jpeg'
}],
};
},
methods: {
// 上传的方法
uploadOnSuccess(file) {
this.imageList.push(file);
},
deleteImage(i) {
this.imageList.splice(i, 1);
},
saveSet(types) {
doFetch('/api-member/members-setting',{
optype: types,
appStatus: !!this.value ? 1 : 0
}).then(res => {
console.log('res' + res);
if (res.data.errorCode === 0) {
if (res.data.result.appStatus == 1) {
this.value = true;
......@@ -60,9 +90,7 @@ export default {
} else {
checkFalse(res.data.message);
}
}).catch(err => {
checkStatus(err);
});
})
}
},
created() {
......@@ -73,14 +101,21 @@ export default {
</script>
<style lang="stylus" scoped>
.setting-container
padding 20px 20px 100px 20px
margin 24px
color #606266
font-size 14px
.setting-con
margin 24px 24px 0
padding 24px 24px 48px
background-color #fff
.setting-container
height 20px
line-height 20px
font-size 14px
.member-setting-txt
position relative
margin-left 5px
top 2px
color #606266
.save-btn
margin-top 20px
margin-top 24px
.member-setting
height 100%
......
src/components/wechatmembers/wechatmemberDetail.js
......@@ -4,6 +4,7 @@ import url from '../../components/axios/url'
import {checkFalse, checkStatus, checkSuccess} from "../../../static/js/checkStatus";
import { fomatBirthday } from '../../utils/fomatBirthday'
import { formatLongTime } from '@/utils/utils';
import { mapState } from 'vuex';
export default {
name: "wechatmember-detail",
......@@ -142,7 +143,7 @@ export default {
mainstoreList: [],
loading: false,
// 这一块的数据真是乱七八糟 都搞不清谁是谁
// 请以后麻烦写好注释 完全不想看这些垃圾代码
// 请以后写好注释 完全不想看
systemTags: null,
tagsList: null,
fieldList: null,
......@@ -174,6 +175,11 @@ export default {
}
}
},
computed: {
...mapState([
'storeImageUrl'
])
},
filters: {
limitText: val => {
if(val) {
......@@ -215,7 +221,9 @@ export default {
checkStatus(err);
});
},
// 切换选中
changeCheck(list) {
console.log(list);
let count = 0;
for(let i = 0; i < list.checkBox.length; i++) {
let val = list.checkBox[i];
......@@ -230,12 +238,14 @@ export default {
if (count == list.subTags.length) {
list.isCheck = 1;
}
console.log(list, count);
},
// 提交编辑导购标签
updateClerkTags() {
let tagIds = [];
this.curTagsList.forEach(ele => {
if (ele.isCheck == 1) {
tagIds.push(item.tagsId);
tagIds.push(ele.tagsId);
}
ele.subTags.forEach(list => {
if (list.isCheck == 1) {
......@@ -248,8 +258,6 @@ export default {
if(tagIds.length > 0) {
curtagIds = tagIds.join(',');
}
console.log(curtagIds);
return;
doFetch(url.updateClerkTags,{
memberId: this.memberId,
tagIds: curtagIds
......@@ -290,11 +298,16 @@ export default {
item.subTags = subTags;
});
// 编辑导购标签组
this.curTagsList = paranttag.map(ele => ({
...ele,
checkBox: []
checkBox: ele.subTags.reduce((res, item) => {
if (item.isCheck) {
res.push(item.tagsName);
}
return res;
}, [])
}));
console.log(this.curTagsList);
}
}else {
checkFalse(res.data.message);
......@@ -315,13 +328,15 @@ export default {
linkRoute(route) {
this.$router.push({ path: route,query: {'memberId': this.memberId}});
},
// 更新头像
updateImgUrl() {
doFetch(url.updateImgUrl,{
memberId: this.memberId
}).then(res => {
if(res.data.errorCode === 0) {
checkSuccess();
this.memberInfo.thirdImgUrl = res.data.result.thirdImgUrl;
const ret = res.data.result;
this.memberInfo.thirdImgUrl = !!ret.thirdImgUrl ? ret.thirdImgUrl : this.storeImageUrl;
}else {
checkFalse(res.data.message);
}
......@@ -499,6 +514,7 @@ export default {
}).then(res => {
this.$refs[formName].resetFields();
if(res.data.errorCode === 0) {
this.getDetail(this.memberId);
checkSuccess();
return true;
}else {
......@@ -564,8 +580,9 @@ export default {
pageName: 'wxMember'
}).then(res => {
if(res.data.errorCode === 0) {
// console.log(res.data.result)
this.memberInfo = res.data.result.memberInfo;
const ret = res.data.result
this.memberInfo = ret.memberInfo;
this.memberInfo.thirdImgUrl = ret.memberInfo.thirdImgUrl ? ret.memberInfo.thirdImgUrl : this.storeImageUrl ;
}else {
checkFalse(res.data.message);
return false;
......@@ -667,6 +684,12 @@ export default {
}
},
created() {
if (!this.storeImageUrl) {
this.$store.dispatch('getStorePicture');
}
this.$store.commit('mutations-slide', false);
},
beforeMount() {
if(this.memberId) {
this.getDetail(this.memberId);
this.getAddressPage();
......@@ -674,7 +697,6 @@ export default {
this.getBaseDetail();
this.getLogPage();
}
this.$store.commit('mutations-slide', false);
},
components: {
'v-nav': nav
......
src/components/wechatmembers/wechatmemberDetail.vue
......@@ -13,7 +13,7 @@
<p style="color: #fff;">更新头像</p>
</div>
</div>
<img width="202px" height="202px" v-if="memberInfo.thirdImgUrl" class="wechat-portraitimg" :src="memberInfo.thirdImgUrl ? memberInfo.thirdImgUrl : './static/img/default.png'" alt="">
<img width="202px" height="202px" v-if="memberInfo.thirdImgUrl" class="wechat-portraitimg" :src="memberInfo.thirdImgUrl ? memberInfo.thirdImgUrl : storeImageUrl" alt="">
</div>
</div>
<div class="wechat-baseitems">
......@@ -545,9 +545,9 @@
<el-checkbox label="选中且禁用" disabled></el-checkbox>
</el-checkbox-group> -->
<div class="lheigth40">{{ item.tagsName }}</div>
<div class="lheigth40" v-if="item.subTags && item.subTags.length">{{ item.tagsName }}</div>
<div class="tag-style">
<el-checkbox-group v-model="item.checkBox">
<el-checkbox-group v-model="item.checkBox" v-if="item.tagsName && item.subTags && item.subTags.length">
<el-checkbox v-for="(list, idx) in item.subTags" class="member-checkout" :key="idx" :label="list.tagsName" @change="changeCheck(item)"></el-checkbox>
</el-checkbox-group>
<!-- <a @click="list.isCheck == 1 ? list.isCheck = 0 : list.isCheck = 1" class="tag-style-item" :class="list.isCheck == 1 ? 'tag-active':''" v-if="item.subTags"
......
src/components/wechatmembers/wechatmembers.js
......@@ -5,6 +5,7 @@ import NavPath from "@/common/navbar/navbar.vue";
import url from '../../components/axios/url'
import {checkFalse, checkStatus, checkSuccess} from "../../../static/js/checkStatus";
import { getParamsByName, formatLongTime, paddingBorth } from '@/utils/utils';
import { mapState } from 'vuex';
let showFields = [];
let qs = require('qs');
......@@ -137,6 +138,11 @@ export default {
integralFlag: ''
}
},
computed: {
...mapState([
'storeImageUrl'
])
},
filters: {
formatField: function (val) {
let tempVal = val;
......@@ -890,7 +896,8 @@ export default {
sex: ele.sex == 0 ? '性别未知' : ele.sex == 1 ? '男' : '女',
age: !!ele.age ? ele.age : '年龄未知',
cardNo: !!ele.cardNo ? ele.cardNo : '无会员卡',
mainStoreName: !!ele.mainStoreName ? ele.mainStoreName : '主门店未知'
mainStoreName: !!ele.mainStoreName ? ele.mainStoreName : '主门店未知',
thirdImgUrl: ele.thirdImgUrl ? ele.thirdImgUrl : this.storeImageUrl
}));
this.page.currentPage = res.data.result.page.currentPage;
this.page.totalCount = res.data.result.page.totalCount;
......@@ -923,13 +930,15 @@ export default {
})
},
created() {
if (!this.storeImageUrl) {
this.$store.dispatch('getStorePicture');
}
this.getProcessList();
this.getEnterpriseInfo();
this.initialize();
this.getAjaxMembers();
},
mounted() {
console.log(this.toggleTag);
beforeMount() {
this.getAjaxMembers();
},
components: {
searchinput,
......
src/components/wechatmembers/wechatmembers.vue
......@@ -2,7 +2,7 @@
<div class="wechat-gic">
<div class="min100">
<nav-path :navpath="navpath">
<router-link to="/memberSetting" tag="span" class="wechat-setting" slot="member">设置</router-link>
<router-link to="/wechatmembers/memberSetting" tag="span" class="wechat-setting member-wechat-set-primary" slot="member">设 置</router-link>
</nav-path>
<div class="wechat-part">
<div class="gic-people">
......@@ -51,9 +51,7 @@
<el-option key="mainstore" label="修改主门店" value="mainstore"></el-option>
<el-option key="store" label="修改协管门店" value="store"></el-option>
</el-select>
<el-button type="primary" icon="el-icon-setting" @click="handleMemberFields" style="width: 32px; line-height: 30px; padding: 0px; margin: 0 5px;"></el-button>
<el-button type="primary" class="member-wechat-setting" icon="el-icon-setting" @click="handleMemberFields"></el-button>
<el-popover
placement="top-start"
:width="popWidth"
......@@ -74,7 +72,7 @@
暂无批量处理数据
</div>
<el-badge slot="reference" :is-dot="isdot" class="item">
<el-button type="primary" icon="el-icon-time" style="width: 32px; line-height: 30px; padding: 0px;"></el-button>
<el-button type="primary" class="member-wechat-timer" icon="el-icon-time"></el-button>
</el-badge>
</el-popover>
</div>
......@@ -200,12 +198,8 @@
{{ scope.row.cardNo }}
</span>
<div v-else-if="item == 'frozenStatus'">
<span class="dm-status--success" v-if="scope.row.frozenStatus == 0">
正常
</span>
<span class="dm-status--warning" v-if="scope.row.frozenStatus == 1">
冻结
</span>
<span class="dm-status--success" v-if="scope.row.frozenStatus == 0">正常</span>
<span class="dm-status--warning" v-if="scope.row.frozenStatus == 1">冻结</span>
</div>
</template>
</el-table-column>
......@@ -322,12 +316,8 @@
{{ scope.row.cardNo }}
</span>
<div v-else-if="item == 'frozenStatus'">
<span class="dm-status--success" v-if="scope.row.frozenStatus == 0">
正常
</span>
<span class="dm-status--warning" v-if="scope.row.frozenStatus == 1">
冻结
</span>
<span class="dm-status--success" v-if="scope.row.frozenStatus == 0">正常</span>
<span class="dm-status--warning" v-if="scope.row.frozenStatus == 1">冻结</span>
</div>
<!-- <span v-else>--</span> -->
</template>
......@@ -385,13 +375,13 @@
</el-radio-group>
</el-form-item>
<el-form-item label="调整额度" prop="accumulatPoints">
<el-input-number v-model="IntegralForm.accumulatPoints" controls-position="right" :min="1" :max="999999"></el-input-number>
<el-input-number v-model="IntegralForm.accumulatPoints" style="width: 400px;" controls-position="right" :min="1" :max="999999"></el-input-number>
</el-form-item>
<el-form-item label="原因备注" prop="remark">
<el-input type="textarea" v-model="IntegralForm.remark"></el-input>
<el-form-item label="原因备注" prop="remark" >
<el-input type="textarea" v-model="IntegralForm.remark" style="width: 400px;"></el-input>
</el-form-item>
<el-form-item label="原始成本主体" v-if="integralFlag == 'gic'">
<el-select prop="settlementStoreId" v-model="IntegralForm.settlementStoreId" filterable remote reserve-keyword placeholder="请输入原始成本主体"
<el-select prop="settlementStoreId" style="width: 400px;" v-model="IntegralForm.settlementStoreId" filterable remote reserve-keyword placeholder="请输入原始成本主体"
:remote-method="handleKeyup" :loading="loading">
<el-option v-for="item in storeList" :key="item.storeId" :label="item.storeName" :value="item.storeId"></el-option>
</el-select>
......@@ -408,12 +398,12 @@
<el-dialog title="批量调整会员等级" :visible.sync="dialogGradeVisible" width="600px">
<el-form ref="gradeForm" :model="gradeForm" :rules="graderules" label-width="120px">
<el-form-item label="调整后等级" prop="gradeId">
<el-select v-model="gradeForm.gradeId" placeholder="请选择">
<el-select v-model="gradeForm.gradeId" placeholder="请选择" style="width: 400px;">
<el-option v-for="item in memberGrade" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="原因备注" prop="remark">
<el-input type="textarea" v-model="gradeForm.remark"></el-input>
<el-input type="textarea" v-model="gradeForm.remark" style="width: 400px;"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -442,7 +432,7 @@
<!-- <p style="line-height: 0;margin-left: 22px;" v-else><span class="pointer" @click="changeStore">点击选择主门店</span></p> -->
</el-form-item>
<el-form-item label="原因备注" prop="remark">
<el-input type="textarea" v-model="mainstoreForm.remark"></el-input>
<el-input type="textarea" v-model="mainstoreForm.remark" style="width: 400px;"></el-input>
</el-form-item>
</el-form>
......@@ -462,7 +452,7 @@
<span style="color: #000;">{{ storeForm.addSubStoreName }}</span>
<span style="color: #000;" v-if="storeForm.subOptType == 1" class="pointer" @click="changeStore">选择门店</span>
</el-radio>
<p class="lheigth40"><el-radio @change="changeSubStore" :label=2 v-model="storeForm.subOptType">将协管门店</el-radio>
<p><el-radio @change="changeSubStore" :label=2 v-model="storeForm.subOptType">将协管门店</el-radio>
<el-select v-model="storeForm.premodefiySubStoreId" placeholder="请选择" :disabled="storeForm.subOptType == 2 ? false : true">
<el-option v-for="item in subStoreList" :key="item.storeId" :label="item.storeName" :value="item.storeId"></el-option>
</el-select>
......@@ -513,9 +503,25 @@
<style lang="stylus">
.wechat-gic
height 100%
.member-wechat-set-primary
&:hover
color #409eff
border-color #c6e2ff
background-color #ecf5ff
.wechat-part
margin-top 20px
padding 0 24px
padding 24px 24px 0
.member-wechat-setting
position relative
top 2px
width 32px
height 32px
line-height 32px
padding 0
.member-wechat-timer
width 32px
height 32px
line-height 32px
padding 0
.handler
background-color #fff
padding 20px
......@@ -530,7 +536,6 @@
color #409eff
.gic-people
position relative
z-index 0
margin-bottom 16px
min-height 100px
background-color #fff
......
src/main.js
import Vue from 'vue'
import App from './App'
import router from './router'
import ElementUI from 'element-ui'
import ElementUI, { Message } from 'element-ui'
import VueAxios from 'vue-axios'
import axios from 'axios'
import store from './store/store'
......@@ -14,6 +14,7 @@ import vueGicHeader from '@gic-test/vue-gic-header'
import vueGicCard from '@gic-test/vue-gic-card'
import vueGicStore from '@gic-test/vue-gic-store'
import vueGicPeople from '@gic-test/vue-gic-people'
import vueGicUploadImage from '@gic-test/vue-gic-upload-image'
import * as custom from 'common/filters/custom'
Vue.config.productionTip = false
import G2 from '@antv/g2';
......@@ -33,7 +34,7 @@ import vueGicAsideMenu from '@gic-test/vue-gic-aside-menu'
import vueGicFooter from '@gic-test/vue-gic-footer'
Vue.use(vueGicAsideMenu)
Vue.use(vueGicFooter)
Vue.use(vueGicUploadImage)
Vue.axios.interceptors.request.use(
config => {
......@@ -53,7 +54,12 @@ Vue.axios.interceptors.response.use(
return response;
},
error => {
return Promise.reject(error)
Message({
message: error.response.data.response.message,
type: 'error',
duration: 3000
});
return Promise.reject(error);
});
Object.keys(custom).forEach(key => {
Vue.filter(key,custom[key]);
......
src/router/index.js
......@@ -5,7 +5,6 @@ import Layout from 'view/layout/Layout.vue'
// import AppMain from 'view/layout/components/AppMain.vue';
Vue.use(Router);
console.log(import('view/login/login'));
export const constantRouterMap = [
{ path: '/login', component: () => import('view/login/login'), name: 'login' },
{ path: '/404', component: () => import('view/errorPage/404'), name: 'error404' },
......@@ -77,7 +76,7 @@ export const constantRouterMap = [
}
},
{
path: '/memberSetting',
path: '/wechatmembers/memberSetting',
component: _import('wechatmembers', 'memberSetting'),
meta: {
title: '微信会员-设置'
......
src/store/store.js
import Vuex from 'vuex'
import Vue from 'vue'
import * as types from './types'
import url from '../components/axios/url'
import { doFetch } from "../components/axios/api"
Vue.use(Vuex);
export default new Vuex.Store({
state: {
title: '',
isShowFoot: true,
slideShow: true
slideShow: true,
forzenList: false,
storeImageUrl: ''
},
mutations: {
[types.TITLE]: (state, data) => {
......@@ -19,5 +23,22 @@ export default new Vuex.Store({
['mutations-slide'](state,data) {
state.slideShow = data;
},
}
['forzen-list'](state, visible) {
state.forzenList = visible;
},
['saveStoreImage'](state, url) {
state.storeImageUrl = url;
}
},
actions: {
getStorePicture({ commit }) {
doFetch(url.getStorePicture).then(res => {
let ret;
if (res.data.errorCode === 0) {
ret = res.data.result;
commit('saveStoreImage', ret.enterpriseInfo.enterpriseUrl);
}
});
}
}
})
static/css/index.styl
......@@ -541,4 +541,9 @@ p {
}
.el-dialog__footer
padding-top 20px
\ No newline at end of file
padding-top 20px
.member-goods-txt
color #909399
.member-table-txt
color #606266
static/font/demo_fontclass.html
......@@ -313,6 +313,12 @@
</li>
<li>
<i class="icon iconfont icon-yuyin"></i>
<div class="name">语音</div>
<div class="fontclass">.icon-yuyin</div>
</li>
<li>
<i class="icon iconfont icon-record-actice"></i>
<div class="name">消费</div>
<div class="fontclass">.icon-record-actice</div>
......@@ -637,6 +643,12 @@
</li>
<li>
<i class="icon iconfont icon-shipin1"></i>
<div class="name">视频</div>
<div class="fontclass">.icon-shipin1</div>
</li>
<li>
<i class="icon iconfont icon-jifenmingxibiao"></i>
<div class="name">积分明细表</div>
<div class="fontclass">.icon-jifenmingxibiao</div>
......
static/font/demo_symbol.html
......@@ -429,6 +429,14 @@
<li>
<svg class="icon" aria-hidden="true">
<use xlink:href="#icon-yuyin"></use>
</svg>
<div class="name">语音</div>
<div class="fontclass">#icon-yuyin</div>
</li>
<li>
<svg class="icon" aria-hidden="true">
<use xlink:href="#icon-record-actice"></use>
</svg>
<div class="name">消费</div>
......@@ -861,6 +869,14 @@
<li>
<svg class="icon" aria-hidden="true">
<use xlink:href="#icon-shipin1"></use>
</svg>
<div class="name">视频</div>
<div class="fontclass">#icon-shipin1</div>
</li>
<li>
<svg class="icon" aria-hidden="true">
<use xlink:href="#icon-jifenmingxibiao"></use>
</svg>
<div class="name">积分明细表</div>
......
static/font/demo_unicode.html
......@@ -333,6 +333,12 @@
</li>
<li>
<i class="icon iconfont">&#xe650;</i>
<div class="name">语音</div>
<div class="code">&amp;#xe650;</div>
</li>
<li>
<i class="icon iconfont">&#xe672;</i>
<div class="name">消费</div>
<div class="code">&amp;#xe672;</div>
......@@ -657,6 +663,12 @@
</li>
<li>
<i class="icon iconfont">&#xe625;</i>
<div class="name">视频</div>
<div class="code">&amp;#xe625;</div>
</li>
<li>
<i class="icon iconfont">&#xe746;</i>
<div class="name">积分明细表</div>
<div class="code">&amp;#xe746;</div>
......
static/font/iconfont.eot
No preview for this file type
static/font/iconfont.js
This source diff could not be displayed because it is too large. You can view the blob instead.
static/font/iconfont.svg
......@@ -170,6 +170,9 @@ Created by iconfont
<glyph glyph-name="hudong" unicode="&#58894;" d="M456.3 798.2h-323c-19.3 0-35-15.7-35-35v-258.6c0-17.6 14.4-32 32-32h326.1c17.6 0 32 14.4 32 32V766.2c-0.1 17.7-14.4 32-32.1 32z m-8-285.6h-310V758.2h310.1v-245.6zM895.7 294.5H572.6c-19.3 0-35-15.7-35-35v-259c0-17.6 14.4-32 32-32h326.1c17.6 0 32 14.4 32 32v262c0 17.6-14.4 32-32 32z m-8-286H577.6v246h310.1v-246zM759.4 670c45.6-53.4 72-123.4 72.6-192.2h-53.2c-2.4 0-3.7-2.9-2.1-4.7l73.2-82.1c1.1-1.2 3.1-1.2 4.2 0l73.2 82.1c1.6 1.8 0.3 4.7-2.1 4.7H872c-0.6 78.2-30.4 157.6-82.2 218.2-26.2 30.7-56.4 54.9-89.8 72.1-35.6 18.3-73 27.6-111.3 27.6v-40c62.9 0 123.5-30.5 170.7-85.7zM265.6 94.3c-45.6 53.4-72 123.4-72.6 192.2h53.2c2.4 0 3.7 2.9 2.1 4.7l-73.2 82.1c-1.1 1.2-3.1 1.2-4.2 0l-73.2-82.1c-1.6-1.8-0.3-4.7 2.1-4.7H153c0.6-78.2 30.4-157.6 82.2-218.2 26.2-30.7 56.4-54.9 89.8-72.1 35.6-18.3 73-27.6 111.3-27.6v40c-62.9 0-123.5 30.4-170.7 85.7z" horiz-adv-x="1024" />
<glyph glyph-name="yuyin" unicode="&#58960;" d="M262.023529 377.976471m-90.352941 0a90.352941 90.352941 0 1 1 180.705883 0 90.352941 90.352941 0 1 1-180.705883 0ZM677.647059 790.588235c-27.105882 27.105882-57.223529 51.2-90.352941 72.282353-21.082353 15.058824-48.188235 9.035294-63.247059-12.047059s-9.035294-48.188235 12.047059-63.247058c27.105882-18.070588 51.2-39.152941 75.294117-63.247059 93.364706-93.364706 144.564706-216.847059 144.564706-352.376471 0-132.517647-54.211765-259.011765-144.564706-352.37647-24.094118-24.094118-48.188235-45.176471-75.294117-63.247059-21.082353-15.058824-27.105882-42.164706-12.047059-63.247059 15.058824-21.082353 42.164706-27.105882 63.247059-12.047059 33.129412 21.082353 63.247059 45.176471 90.352941 72.282353 108.423529 108.423529 171.670588 256 171.670588 415.623529 0 165.647059-63.247059 313.223529-171.670588 421.647059zM508.988235 621.929412c-15.058824 15.058824-33.129412 30.117647-51.2 42.164706-24.094118 15.058824-51.2 9.035294-66.258823-12.047059-15.058824-21.082353-9.035294-48.188235 12.047059-63.247059 15.058824-9.035294 27.105882-21.082353 39.152941-33.129412 48.188235-48.188235 75.294118-111.435294 75.294117-180.705882s-27.105882-132.517647-75.294117-180.705882c-12.047059-12.047059-24.094118-21.082353-39.152941-33.129412-21.082353-15.058824-27.105882-42.164706-12.047059-63.247059 15.058824-21.082353 42.164706-27.105882 63.247059-12.047059 18.070588 12.047059 36.141176 27.105882 51.2 42.164706 63.247059 63.247059 102.4 150.588235 102.4 243.952941s-36.141176 183.717647-99.388236 249.976471z" horiz-adv-x="1024" />
<glyph glyph-name="record-actice" unicode="&#58994;" d="M125.8 350.29999999999995V676c0 47 30.7 83.7 77.2 90.4 15.5 1.8 31.2 1.9 46.8 0.5 14.8-1 25.5-15.4 24.8-30.5-0.6-15.3-12.8-27.6-28.1-28.4-9.9-0.3-19.8 0-29.6-0.1-19.1-0.3-31.6-12.8-31.6-32v-651.4c0-19.6 12.6-32.1 32.1-32.1h591.5c20.1 0 32.3 12.4 32.4 33.2V204.89999999999998l0.1 468.5c0.6 8.1-1.6 16.1-6.2 22.8a29.27 29.27 0 0 1-23.5 11.8c-9.8 0.2-19.8 0-29.6 0.1-16.5-0.2-30.1 12.9-30.4 29.4-0.1 7.9 3 15.6 8.5 21.2 5.6 5.6 13.2 8.8 21.1 8.7 17.1-0.2 34.5 0.6 50.9-2.8 39.3-8.1 67.1-43.4 68.5-83.3l0.1-6.8v-648.3c0-39.1-17.5-67.8-52.7-85.1-11.6-5.5-24.3-8.2-37.1-8H215.8c-24-0.2-47.1 9.2-64 26.2s-26.3 40.1-26 64.1V350.29999999999995z m0 0M692 765.9c0 35.5-25.6 61.1-61.2 61.1H395.9c-36 0-61.3-25.4-61.4-61.4-0.1-18.2-0.1-36.3-0.1-54.5 0.1-37.7 25.1-62.7 62.8-62.7h116.2c40 0.1 79.9-0.3 119.8 0.1 15.8 0 30.9 6.4 41.9 17.6 11.1 11.3 17.1 26.5 16.8 42.2 0.3 19.3 0.2 38.5 0.1 57.6z m-59.8-57.6H394.5V767h237.7v-58.7zM658.7 333.5c6.9 0 13.3 2.6 18.1 7.4 4.6 4.6 7.1 10.7 7.1 17.1 0 6.4-2.5 12.5-7.1 17-4.8 4.8-11.2 7.5-18.1 7.5H538.9l-0.1 0.7 137.5 137.5c4.8 4.8 7.5 11.2 7.5 18 0 6.5-2.5 12.6-7 17.1-4.5 4.5-10.6 7-17.1 7-6.8 0-13.2-2.7-18.1-7.5L515 428.7 388.4 555.3c-4.8 4.9-11.2 7.5-18 7.5-6.5 0-12.6-2.5-17.1-7-4.5-4.5-7.1-10.6-7.1-17.1 0-6.8 2.7-13.2 7.6-18l136.7-135.5v-2.7H371.4c-6.9 0-13.3-2.6-18.1-7.5-4.6-4.6-7.1-10.7-7.1-17 0-13.5 11.3-24.5 25.2-24.5h119.1v-59.2H371.4c-6.9 0-13.3-2.6-18.1-7.5-4.6-4.6-7.1-10.7-7.1-17 0-13.5 11.3-24.5 25.2-24.5h119.1v-83.1c0-13.9 11-25.1 24.5-25.1s24.5 11.3 24.5 25.1v83.1h119.1c6.9 0 13.3 2.6 18.1 7.4 4.6 4.6 7.1 10.6 7.1 17s-2.5 12.4-7.1 17.1c-4.8 4.8-11.2 7.5-18.1 7.5H539.5v59.2h119.2z" horiz-adv-x="1024" />
......@@ -332,6 +335,9 @@ Created by iconfont
<glyph glyph-name="saomiao" unicode="&#58974;" d="M138.666667 512c-17.6 0-32 14.4-32 32V725.333333c0 35.2 28.8 64 64 64h224c17.6 0 32-14.4 32-32s-14.4-32-32-32H170.666667v-181.333333c0-17.6-14.4-32-32-32zM394.666667-21.333333H170.666667c-35.2 0-64 28.8-64 64v181.333333c0 17.6 14.4 32 32 32s32-14.4 32-32v-181.333333h224c17.6 0 32-14.4 32-32s-14.4-32-32-32zM885.333333 512c-17.6 0-32 14.4-32 32V725.333333h-224c-17.6 0-32 14.4-32 32s14.4 32 32 32h224c35.2 0 64-28.8 64-64v-181.333333c0-17.6-14.4-32-32-32zM853.333333-21.333333h-224c-17.6 0-32 14.4-32 32s14.4 32 32 32h224v181.333333c0 17.6 14.4 32 32 32s32-14.4 32-32v-181.333333c0-35.2-28.8-64-64-64zM885.333333 352H138.666667c-17.6 0-32 14.4-32 32s14.4 32 32 32h746.666666c17.6 0 32-14.4 32-32s-14.4-32-32-32z" horiz-adv-x="1024" />
<glyph glyph-name="shipin1" unicode="&#58917;" d="M512 896C229.376 896 0 666.624 0 384s229.376-512 512-512 512 229.376 512 512S794.624 896 512 896z m0-965.632c-250.368 0-453.632 203.264-453.632 453.632 0 250.368 203.264 453.632 453.632 453.632s453.632-203.264 453.632-453.632-203.264-453.632-453.632-453.632zM723.968 447.488L460.8 599.552c-10.752 6.144-23.552 9.728-36.352 9.728-40.448 0-73.216-32.768-72.704-73.216v-304.128c-0.512-26.112 13.312-50.688 36.352-63.488 10.752-6.144 23.552-9.728 36.352-9.728s25.088 3.584 36.352 9.728l263.168 152.576c10.752 6.144 19.968 15.36 26.624 26.624 20.48 34.816 8.192 79.872-26.624 99.84z" horiz-adv-x="1024" />
<glyph glyph-name="jifenmingxibiao" unicode="&#59206;" d="M1199.104 885.248H527.36c-91.136 0-165.376-74.24-165.376-165.376v-671.744c0-87.04 67.584-158.72 153.088-164.864v-0.512h684.032c91.136 0 165.376 74.24 165.376 165.376V719.872c0 91.136-74.24 165.376-165.376 165.376z m86.528-184.32v-631.296c0-58.368-47.616-105.984-105.984-105.984H546.304c-58.368 0-105.984 47.616-105.984 105.984V700.928c0 58.368 47.616 105.984 105.984 105.984h633.344c58.368 0 105.984-47.616 105.984-105.984zM760.832 523.776H1116.16c24.576 0 45.056 19.968 45.056 45.056 0 24.576-19.968 45.056-45.056 45.056h-355.328c-24.576 0-45.056-19.968-45.056-45.056s19.968-45.056 45.056-45.056zM610.304 173.056m-45.056 0a45.056 45.056 0 1 1 90.112 0 45.056 45.056 0 1 1-90.112 0ZM610.304 370.688m-45.056 0a45.056 45.056 0 1 1 90.112 0 45.056 45.056 0 1 1-90.112 0ZM1116.16 415.744h-355.328c-24.576 0-45.056-19.968-45.056-45.056 0-24.576 19.968-45.056 45.056-45.056H1116.16c24.576 0 45.056 19.968 45.056 45.056s-20.48 45.056-45.056 45.056zM1116.16 217.6h-355.328c-24.576 0-45.056-19.968-45.056-45.056s19.968-45.056 45.056-45.056H1116.16c24.576 0 45.056 19.968 45.056 45.056s-20.48 45.056-45.056 45.056zM610.304 568.832m-45.056 0a45.056 45.056 0 1 1 90.112 0 45.056 45.056 0 1 1-90.112 0Z" horiz-adv-x="1637" />
......
static/font/iconfont.ttf
No preview for this file type
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