Skip to content

M
member
Commit 3c837af6 by member
Options

新增会员详情集团会员的一些字段

parent f7294198
Showing with 66 additions and 54 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./static/img/favicon.ico><script src=./static/js/loginanimate.js></script><script src=https://unpkg.com/lodash@4.13.1/lodash.min.js></script><title>memberproject</title><link href=./static/css/app.e350d7a0e74cbc910478141e99d1be23.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.7efc2e7c6d4b4252e74a.js></script><script type=text/javascript src=./static/js/vendor.0b8b3c9f2d9f8285a71f.js></script><script type=text/javascript src=./static/js/app.120f6296130efd320700.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./static/img/favicon.ico><script src=./static/js/loginanimate.js></script><script src=https://unpkg.com/lodash@4.13.1/lodash.min.js></script><title>memberproject</title><link href=./static/css/app.c37793f7054e9879a4b936babd51e15d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.57cd290846154fec4815.js></script><script type=text/javascript src=./static/js/vendor.48709bcd3e289513f9ef.js></script><script type=text/javascript src=./static/js/app.665c560d4e68c76e8824.js></script></body></html>
\ No newline at end of file
dist/static/js/40.981068497df07dc5e60f.js → dist/static/js/39.fa1b0ac78eb4275751c8.js
webpackJsonp([40],{JWGL:function(t,r,a){"use strict";Object.defineProperty(r,"__esModule",{value:!0});var e=a("5qiO"),i=a.n(e),n=a("9r/T"),h={data:function(){return{chart:null}},props:{charData:{type:Array,default:function(){return[]}},id:String,width:{type:Number,default:null}},mounted:function(){var t=this;Object(n.setTimeout)(function(){t.drawChart()},30)},beforeUpdate:function(){this.drawChart()},watch:{charData:function(){this.drawChart()}},methods:{drawChart:function(){this.chart&&this.chart.destroy(),this.chart=new i.a.Chart({container:this.id,width:this.width}),this.chart.source(this.charData,{"新增会员":{formatter:function(t){return t+"%"}}}),this.chart.scale("sales",{tickInterval:20}),this.chart.interval().position("keyword*新增会员").size(40),this.chart.render()}}},c={render:function(){var t=this.$createElement;return(this._self._c||t)("div",{attrs:{id:this.id}})},staticRenderFns:[]};var s=a("C7Lr")(h,c,!1,function(t){a("dGyM")},"data-v-1c09009f",null);r.default=s.exports},dGyM:function(t,r){}});
\ No newline at end of file
webpackJsonp([39],{JWGL:function(t,r,a){"use strict";Object.defineProperty(r,"__esModule",{value:!0});var e=a("5qiO"),i=a.n(e),n=a("9r/T"),h={data:function(){return{chart:null}},props:{charData:{type:Array,default:function(){return[]}},id:String,width:{type:Number,default:null}},mounted:function(){var t=this;Object(n.setTimeout)(function(){t.drawChart()},30)},beforeUpdate:function(){this.drawChart()},watch:{charData:function(){this.drawChart()}},methods:{drawChart:function(){this.chart&&this.chart.destroy(),this.chart=new i.a.Chart({container:this.id,width:this.width}),this.chart.source(this.charData,{"新增会员":{formatter:function(t){return t+"%"}}}),this.chart.scale("sales",{tickInterval:20}),this.chart.interval().position("keyword*新增会员").size(40),this.chart.render()}}},c={render:function(){var t=this.$createElement;return(this._self._c||t)("div",{attrs:{id:this.id}})},staticRenderFns:[]};var s=a("C7Lr")(h,c,!1,function(t){a("dGyM")},"data-v-1c09009f",null);r.default=s.exports},dGyM:function(t,r){}});
\ No newline at end of file
dist/static/js/app.120f6296130efd320700.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.665c560d4e68c76e8824.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.57cd290846154fec4815.js 0 → 100644
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,d,n){for(var t,r,o,i=0,u=[];i<a.length;i++)r=a[i],f[r]&&u.push(f[r][0]),f[r]=0;for(t in d)Object.prototype.hasOwnProperty.call(d,t)&&(e[t]=d[t]);for(c&&c(a,d,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=b(b.s=n[i]);return o};var a={},f={47:0};function b(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,b),f.l=!0,f.exports}b.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,b){c=f[e]=[a,b]});c[2]=a;var d=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,b.nc&&n.setAttribute("nonce",b.nc),n.src=b.p+"static/js/"+e+"."+{0:"f18ece77a6d3ec4aaa0a",1:"25b003fd3b8eb76ff9ee",2:"5c6154bf12f08aaff337",3:"776c8aa0c9e9398356cc",4:"23fcb1b43b201e4e5991",5:"c06442a9c9d37b1e1ce0",6:"6bb0f79e4cb6f2e0339c",7:"709c600a8be62ef647cd",8:"b5cf967ed634aeb8de1c",9:"ea151bce66f53fb6af2e",10:"09688d85614d4ddccc95",11:"baa4aa5b80a874b5b53d",12:"8fc080b24d0cd5e889ee",13:"f147727990c54695d2c7",14:"4e67c77293fd77d9504f",15:"2856a93325f47b814424",16:"705c139b7e5ad3125d37",17:"5d584b07f0787d142ed7",18:"8fdf7ddde25cb00462b9",19:"0a25ebbfd539969ff0e9",20:"880ba2ef24bf5f260959",21:"6d0cf6f6576ae0862ae2",22:"fb6e01e3a8df7b012b53",23:"ff41fe28fb720a2cb892",24:"206814f7ed76d5755d87",25:"bdf5c901594651c03e51",26:"28692db27d60442a1b4d",27:"24b8ce5f4cd8e9a70679",28:"be7eaeaddfa12cdc882c",29:"4b009962cfee3bcfec59",30:"498145fbf206cbe29b76",31:"4d0f45cfee8a4f4cade0",32:"92123fd18b5ebbea6574",33:"790251cce3c7b52b5435",34:"c91edb2a74c3bc0da78a",35:"6a9117cc3e8acfae9cdb",36:"a3972054315c28e247d0",37:"4311896bf338e807e136",38:"a78dda1aa86546f4c11d",39:"fa1b0ac78eb4275751c8",40:"78204a9f2b4fda5ae61d",41:"0f4a4311f0585007c0bf",42:"cd85e5d923b1bfa252b0",43:"ba623c7130185fb82006",44:"d3a0ece25012f971916a"}[e]+".js";var t=setTimeout(r,12e4);function r(){n.onerror=n.onload=null,clearTimeout(t);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return n.onerror=n.onload=r,d.appendChild(n),a},b.m=e,b.c=a,b.d=function(e,c,a){b.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},b.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(c,"a",c),c},b.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},b.p="./",b.oe=function(e){throw e}}([]);
\ No newline at end of file
dist/static/js/manifest.7efc2e7c6d4b4252e74a.js deleted 100644 → 0
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(f,n,t){for(var r,b,o,i=0,u=[];i<f.length;i++)b=f[i],a[b]&&u.push(a[b][0]),a[b]=0;for(r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r]);for(c&&c(f,n,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)o=d(d.s=t[i]);return o};var f={},a={47:0};function d(c){if(f[c])return f[c].exports;var a=f[c]={i:c,l:!1,exports:{}};return e[c].call(a.exports,a,a.exports,d),a.l=!0,a.exports}d.e=function(e){var c=a[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var f=new Promise(function(f,d){c=a[e]=[f,d]});c[2]=f;var n=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,d.nc&&t.setAttribute("nonce",d.nc),t.src=d.p+"static/js/"+e+"."+{0:"f18ece77a6d3ec4aaa0a",1:"25b003fd3b8eb76ff9ee",2:"72732c71263f8275517b",3:"43f5a182b8bac33fe0ac",4:"02278c6faec2bda03f0f",5:"c06442a9c9d37b1e1ce0",6:"6bb0f79e4cb6f2e0339c",7:"709c600a8be62ef647cd",8:"b5cf967ed634aeb8de1c",9:"03c114ac3d1bacdd8fa8",10:"09688d85614d4ddccc95",11:"baa4aa5b80a874b5b53d",12:"2ffe5dec73a9005f8260",13:"f147727990c54695d2c7",14:"4e67c77293fd77d9504f",15:"2856a93325f47b814424",16:"705c139b7e5ad3125d37",17:"fe5027e1dfb4d205a8dd",18:"8fdf7ddde25cb00462b9",19:"69a094badfc2cffc7dba",20:"880ba2ef24bf5f260959",21:"6d0cf6f6576ae0862ae2",22:"fb6e01e3a8df7b012b53",23:"ff41fe28fb720a2cb892",24:"206814f7ed76d5755d87",25:"bdf5c901594651c03e51",26:"28692db27d60442a1b4d",27:"b4c3fd18d3abe1792b1e",28:"64c740ce3376d71b00b0",29:"4b009962cfee3bcfec59",30:"880eb0340ca50843a500",31:"4d0f45cfee8a4f4cade0",32:"44accdcd6f3bd018f886",33:"790251cce3c7b52b5435",34:"3b3c920d2f18aba5d97c",35:"6a9117cc3e8acfae9cdb",36:"a3972054315c28e247d0",37:"4311896bf338e807e136",38:"f8e16ffe55241f6c2f9b",39:"4fd8ff1be0c7520645e1",40:"981068497df07dc5e60f",41:"0f4a4311f0585007c0bf",42:"cd85e5d923b1bfa252b0",43:"ba623c7130185fb82006",44:"d3a0ece25012f971916a"}[e]+".js";var r=setTimeout(b,12e4);function b(){t.onerror=t.onload=null,clearTimeout(r);var c=a[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return t.onerror=t.onload=b,n.appendChild(t),f},d.m=e,d.c=f,d.d=function(e,c,f){d.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:f})},d.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(c,"a",c),c},d.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},d.p="./",d.oe=function(e){throw e}}([]);
\ No newline at end of file
src/components/posmembers/posmemberDetail.vue
......@@ -46,11 +46,11 @@
<div class="pos-content">
<div class="pos-flex">
<div class="pos-leftcontent">
<div class="pos-item"><span class="pos-leftitem">会员卡号 <span class="pos-color"> {{ posMemberInfo.cardNum }} </span></span></div>
<div class="pos-item"><span class="pos-leftitem">会员等级 <span class="pos-color"> {{ posMemberInfo.gradeName }}
<div class="pos-item"><span class="pos-leftitem">商户会员卡号 <span class="pos-color"> {{ posMemberInfo.cardNum }} </span></span></div>
<div class="pos-item"><span class="pos-leftitem">商户会员等级 <span class="pos-color"> {{ posMemberInfo.gradeName }}
<i class="el-icon-edit pointer" @click="handlerGrade"></i></span></span></div>
<div class="pos-item"><span class="pos-leftitem">到期时间 <span class="pos-color"> {{ posMemberInfo.limitTime | formatTime }} </span></span></div>
<div class="pos-item"><span class="pos-leftitem">开卡门店 <span class="pos-color"> {{ posMemberInfo.storeName }} </span></span></div>
<div class="pos-item"><span class="pos-leftitem·">开卡门店 <span class="pos-color"> {{ posMemberInfo.storeName }} </span></span></div>
<div class="pos-item"><span class="pos-leftitem">开卡时间 <span class="pos-color"> {{ posMemberInfo.cardGivingTime | formatTime }} </span></span></div>
<div class="pos-item"><span class="pos-leftitem">姓名 <span class="pos-color"> {{ posMemberInfo.memberName }}
<i class="el-icon-edit pointer" @click="editGrade(1)"></i></span></span></div>
......@@ -61,6 +61,11 @@
<div class="pos-item"><span class="pos-leftitem">手机号码 <span class="pos-color"> {{ posMemberInfo.phoneNumber }}
<i class="el-icon-edit pointer" @click="editGrade(4)"></i></span></span></div>
<div class="pos-item"><span class="pos-leftitem">退订状态 <span class="pos-color"> {{ posMemberInfo.unsubscribe == 1 ? '退订' : '未退订' }} </span></span></div>
<div class="pos-item"><span class="pos-leftitem">集团会员卡号 <span class="pos-color"> {{ posMemberInfo.cliqueCardNo | fomatText }} </span></span></div>
<div class="pos-item"><span class="pos-leftitem">集团会员等级 <span class="pos-color"> {{ posMemberInfo.cliqueGradeName | fomatText }} </span></span></div>
<div class="pos-item"><span class="pos-leftitem">集团会员积分 <span class="pos-color"> {{ posMemberInfo.cliqueMemberIntegral | fomatText }} </span></span></div>
</div>
</div>
<div class="pos-rightcontent">
......@@ -171,7 +176,7 @@
<div class="record-border">
<div class="record-countwrap">
<p v-for="item in payInfo"><span class="record-count">{{ item.name }}</span><span class="record-countvalue">{{ item.value }}</span></p>
<p v-for="(item, index) in payInfo" :key="index"><span class="record-count">{{ item.name }}</span><span class="record-countvalue">{{ item.value }}</span></p>
</div>
</div>
<div class="record-border">
......
src/components/wechatmembers/ajaxmembersinfo.vue
......@@ -195,7 +195,7 @@
<div class="evaluate-con">
<div class="item" v-for="(item, index) in evaluateData" :key="index">
{{item.ruleName}}
<div class="evaluate-star"><el-rate disabled v-model="item.evaluateScore"></el-rate></div>
<div class="evaluate-star"><el-rate disabled v-model="item.evaluateScore" :colors="['#99A9BF', '#F7BA2A', '#FF9900']"></el-rate></div>
</div>
</div>
<div class="e-txt">
......@@ -339,7 +339,11 @@
createTime: data.createTime != -1 ? formatLongTime(data.createTime, 1) : '--',
replayDate: data.replayDate != -1 ? formatLongTime(data.replayDate, 1) : '--'
};
this.evaluateData = data.scoresList;
this.evaluateData = data.scoresList.map(ele => ({
...ele,
evaluateScore: ele.evaluateScore / 2
}));
}else {
checkFalse(res.data.message);
}
......
src/components/wechatmembers/wechatmemberDetail.js
......@@ -634,7 +634,6 @@ export default {
createTime: ele.createTime != -1 ? formatLongTime(ele.createTime, 1) : '--'
}));
}
console.log(this.remarkList);
this.openField = res.data.result.openField;
this.fieldList = res.data.result.fieldList;
this.isGrilClothes = res.data.result.isGrilClothes;
......
src/components/wechatmembers/wechatmemberDetail.vue
......@@ -96,19 +96,28 @@
<div class="wechat-cardcontent">
<div class="wechat-carditems lheigth30">
<div class="wechat-carditem">
<span>会员卡号</span><span class="ml15 w135 ell disinline-txt" :title="memberInfo.cardNum">{{ memberInfo.cardNum | fomatNumber }}</span>
<span>商户会员卡号</span><span class="ml15 w135 ell disinline-txt" :title="memberInfo.cardNum">{{ memberInfo.cardNum | fomatNumber }}</span>
</div>
<div class="wechat-carditem">
<span>会员集团卡号</span><span class="ml15 w135 ell disinline-txt" :title="memberInfo.cardNumOfClique">{{ memberInfo.cardNumOfClique | fomatNumber }}</span>
<span>集团会员卡号</span><span class="ml15 w135 ell disinline-txt" :title="memberInfo.cardNumOfClique">{{ memberInfo.cardNumOfClique | fomatNumber }}</span>
</div>
</div>
<div class="wechat-carditems lheigth40">
<div class="wechat-carditem">
<span>会员等级</span><span class="ml15 color555">{{ memberInfo.gradeName | fomatText }}</span>
<span>商户会员等级</span><span class="ml15 color555">{{ memberInfo.gradeName | fomatText }}</span>
<span class="ml15" @click="handlerGrade"><i class="el-icon-edit pointer"></i></span>
</div>
<div class="wechat-carditem">
<span>集团会员等级</span><span class="ml15 color555">{{ memberInfo.cliqueGradeName | fomatText }}</span>
</div>
</div>
<div class="wechat-carditems lheigth40">
<div class="wechat-carditem">
<span>集团会员积分</span><span class="ml15 color555">{{ memberInfo.cliqueMemberIntegral | fomatText }}</span>
</div>
<div class="wechat-carditem">
<span>认证时间</span><span class="ml15 color555">{{ memberInfo.authTime | formatTime }}</span>
</div>
</div>
......@@ -171,28 +180,9 @@
</div>
</div>
</div>
<div class="wechat-parttwo mTop20">
<el-table :data="addressData" border>
<el-table-column prop="addressInfo" label="收货地址"></el-table-column>
<el-table-column prop="addressee" label="收件人"></el-table-column>
<el-table-column prop="mobile" label="手机号码"></el-table-column>
<el-table-column prop="unsubscribe" label="退订状态">
<template slot-scope="scope">
{{ scope.row.unsubscribe === 0 ? '否' : '是'}}
</template>
</el-table-column>
</el-table>
<div class="addresspage tRight" v-if="addresspage.totalCount > 0">
<el-pagination
@current-change="handleAddressCurrentChange"
:current-page="addresspage.currentPage"
:page-sizes="[20, 40, 60, 80]"
:page-size="addresspage.pageSize"
layout="prev, pager, next"
:total="addresspage.totalCount">
</el-pagination>
</div>
</div>
<div class="wechat-partthree wechat-record mTop20">
<div class="wechat-recorditem bordercustom">
<div class="wechat-cardtitle mBottom10 font14">消费记录</div>
......@@ -247,6 +237,7 @@
</div>
</div>
</div>
<div class="wechat-partfour bordercustom mTop20 bordercustom">
<div class="labeltag borderBottom">
<span class="labeltag-tab font14 pointer" :class="{'labeltag-tabactive': labelTagactive === 1}" @click="labelTagactive=1">标签及备注</span>
......@@ -385,6 +376,29 @@
</div>
</div>
</div>
<div class="wechat-parttwo mTop20">
<el-table :data="addressData" border>
<el-table-column prop="addressInfo" label="收货地址"></el-table-column>
<el-table-column prop="addressee" label="收件人"></el-table-column>
<el-table-column prop="mobile" label="手机号码"></el-table-column>
<el-table-column prop="unsubscribe" label="退订状态">
<template slot-scope="scope">
{{ scope.row.unsubscribe === 0 ? '否' : '是'}}
</template>
</el-table-column>
</el-table>
<div class="addresspage tRight" v-if="addresspage.totalCount > 0">
<el-pagination
@current-change="handleAddressCurrentChange"
:current-page="addresspage.currentPage"
:page-sizes="[20, 40, 60, 80]"
:page-size="addresspage.pageSize"
layout="prev, pager, next"
:total="addresspage.totalCount">
</el-pagination>
</div>
</div>
</div>
</div>
</div>
......@@ -668,7 +682,7 @@
&-chanel
flex 0 0 400px
width: 400px;
height: 230px;
height: 260px;
border: 1px solid $wechattagcolor;
vertical-align: top;
font-size: 14px;
......@@ -676,7 +690,7 @@
flex 1
&-cardinfo
width 500px
height 230px
height 260px
border 1px solid $wechattagcolor
vertical-align top
font-size 14px
......
src/components/wechatmembers/wechatmembers.vue
......@@ -14,7 +14,7 @@
:projectName="projectName"
:sceneValue="sceneValue"
ref="peopleFilter"
:isAdd="false"
:isAdd="true"
@findFilter="findFilter"
@editHide= "editHide"
@editShow="editShow"
......
src/test/upload-folder.vue
......@@ -6,13 +6,11 @@
:options="dropzoneOptions"
:action="folderUrl"
:parentId="parentId"
@upload-complete="uploadComplete"
:useCustomSlot="true">
<i class="el-icon-upload"></i>
<div class="el-upload__text">将图片或文件夹拖到此处上传，或点击<b>上传</b>图片</div>
<div class="upload-tips">仅支持5M以内的jpg、png、gif格式的图片</div>
</vue-gic-space>
<el-button @click="getImageList">图片列表</el-button>
</div>
</template>
......@@ -34,14 +32,6 @@ export default {
parentId: '60404611a2a64502b0612b703f8c3b27',
folderUrl: 'http://gicdev.com/api-mall/gic-cloud-image-createUploadFolder?requestProject=member'
}
},
methods: {
getImageList() {
this.axios.get('http://gicdev.com/api-mall/gic-cloud-image-list?requestProject=member&currentPage=1&pageSize=20&sortType=timeDesc&parentId=60404611a2a64502b0612b703f8c3b27&searchParams=')
},
uploadComplete() {
alert('上传成功');
}
}
};
</script>
......
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