Merge branch 'master' of http://115.159.76.241/gicmember/member into dev

# Conflicts:
#	dist/index.html
#	dist/static/css/app.4e987485d9d24109a9c7f2515d200be2.css
#	dist/static/js/29.404d582ecf449de44818.js
#	dist/static/js/30.1dc5b5848ad8bff185fc.js
#	dist/static/js/30.215eeb5cebda0312826a.js
#	dist/static/js/31.cdc7cb45e9d71d03b029.js
#	dist/static/js/app.f0565f859fdebea007db.js
#	dist/static/js/manifest.a56f64d242a35206cac2.js
#	src/components/posmembers/posmemberDetail.vue

dist/static/js/31.cdc7cb45e9d71d03b029.js

+webpackJsonp([31],{U3e5:function(e,t){},VPyt:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var i=a("Dd8w"),l=a.n(i),r=a("WSiR"),n=a("AKaA"),s=a("NTL1"),o=a("8V46"),d={name:"labelmanager",data:function(){return{addTagCount:0,bodyHeight:document.body.clientHeight||document.documentElement.clientHeight,collapseFlag:!1,leftModulesName:"会员标签",projectName:"member",inputVisible:!1,inputValue:"",navpath:[{name:"首页",path:""},{name:"会员标签",path:""}],dilogLabelFormVisible:!1,dilogAddFormVisible:!1,labelForm:{tagName:"",tagDescribe:""},addLabelForm:{tagName:""},tagList:[],curpTagId:null}},created:function(){this.$store.commit("mutations-slide",!1),this.TimeFlag=!1},methods:{showInput:function(e,t){var a=this;e.inputVisible=!0,this.curpTagId=e.pTagId,this.$nextTick(function(e){var i="saveTag"+t;a.$refs[i][0].$refs.input.focus()})},handleInputConfirm:function(e,t,a){var i=this,l=e.inputVal;if(l){e.inputVal="";var r=!0;if(this.tagList[t].sonList.length&&(r=this.tagList[t].sonList.every(function(e){return l!==e.tagName})),!r)return void this.$message.warning("已存在该标签名，不能重复添加！");Object(n.a)(s.a.insertSonTag,{tagName:l,pTagId:this.curpTagId}).then(function(t){if(0===t.data.errorCode)return Object(o.c)(),i.inputVisible=!1,e.inputVal="",i.getLabel(),!1;Object(o.a)(t.data.message),i.dilogAddFormVisible=!1}).catch(function(e){Object(o.b)(e),i.dilogAddFormVisible=!1})}},AddTagType:function(){this.labelForm.tagName="",this.labelForm.tagDescribe="",this.dilogLabelFormVisible=!0},AddParentTag:function(){var e=this;e.$refs.addForm.validate(function(t){if(t){var a=!0;if(e.tagList.length&&(a=e.tagList.every(function(t){return e.labelForm.tagName!==t.tagName})),!a)return void e.$message.warning("已存在该标签类型");if(!e.labelForm.tagName.trim()||!e.labelForm.tagDescribe.trim())return Object(o.a)("标签名称和描述都不能为空"),!1;Object(n.a)(s.a.insertParentTag,{tagName:e.labelForm.tagName,tagDescribe:e.labelForm.tagDescribe}).then(function(t){0===t.data.errorCode?(Object(o.c)(),e.getLabel()):Object(o.a)(t.data.message),e.dilogLabelFormVisible=!1}).catch(function(t){Object(o.b)(t),e.dilogLabelFormVisible=!1})}})},deleteGroup:function(e,t){var a=this,i="",l="";1===t&&(l=s.a.deleteParentTag,i={pTagId:e}),2===t&&(l=s.a.deleteSonTag,i={sTagId:e}),this.$confirm("确认删除","提示",{confirmButtonText:"确定",cancelButtonText:"取消",type:"warning"}).then(function(){Object(n.a)(l,i).then(function(e){if(0!==e.data.errorCode)return Object(o.a)(e.data.message),!1;a.getLabel(),Object(o.c)("删除成功")}).catch(function(e){Object(o.b)(e)})}).catch(function(e){a.$message.info("已取消删除")})},submitAddLabel:function(){var e=this;if(this.$refs.addChildForm.validate(function(e){return!e}),!this.addLabelForm.tagName.trim())return Object(o.a)("标签名称不能为空"),!1;Object(n.a)(s.a.insertSonTag,{tagName:this.addLabelForm.tagName,pTagId:this.curpTagId}).then(function(t){0===t.data.errorCode?(Object(o.c)(),e.getLabel()):Object(o.a)(t.data.message),e.dilogAddFormVisible=!1}).catch(function(t){Object(o.b)(t),e.dilogAddFormVisible=!1})},addLabel:function(e){this.dilogAddFormVisible=!0,this.addLabelForm.tagName="",this.curpTagId=e},getLabel:function(){var e=this;Object(n.a)(s.a.tagManageList).then(function(t){if(0!==t.data.errorCode)return Object(o.a)(t.data.message),!1;e.tagList=t.data.result.tagList&&t.data.result.tagList.length&&t.data.result.tagList.map(function(e){return l()({},e,{inputVisible:!1,inputVal:""})})}).catch(function(e){Object(o.b)(e)})}},mounted:function(){var e=this;this.getLabel(),window.onresize=function(){e.bodyHeight=document.body.clientHeight||document.documentElement.clientHeight}},components:{"v-nav":r.a}},c={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"labelmanage",style:{height:e.bodyHeight-64+"px"}},[a("div",{staticClass:"label-container min100"},[a("v-nav",{attrs:{navpath:e.navpath}}),e._v(" "),a("div",{staticClass:"labelcontainer-wrap"},[a("div",{staticClass:"labelcontainer"},[a("div",{staticClass:"tr pad-b-24"},[a("el-button",{attrs:{type:"primary"},on:{click:e.AddTagType}},[e._v("新增标签类型")])],1),e._v(" "),a("div",{staticClass:"labelList marginAuto clear"},e._l(e.tagList,function(t,i){return a("div",{key:i,staticClass:"labelitem"},[a("div",{staticClass:"group"},[a("el-button",{staticClass:"grouptitle",attrs:{size:"small",type:"text"}},[e._v(e._s(t.tagName))]),e._v(" "),a("el-button",{staticClass:"grouptag fr",attrs:{size:"small",type:"danger",plain:""},on:{click:function(a){return e.deleteGroup(t.pTagId,1)}}},[e._v("删除")])],1),e._v(" "),a("div",{staticClass:"group-items"},[e._l(t.sonList,function(t,i){return a("el-tag",{key:i,attrs:{closable:""},on:{close:function(a){return e.deleteGroup(t.sTagId,2)}}},[e._v(" "+e._s(t.tagName)+" ")])}),e._v(" "),t.inputVisible?a("el-input",{ref:"saveTag"+i,refInFor:!0,staticClass:"input-new-tag",staticStyle:{"vertical-align":"inherit"},attrs:{size:"small"},on:{blur:function(a){return e.handleInputConfirm(t,i,a)}},nativeOn:{keyup:function(a){return!a.type.indexOf("key")&&e._k(a.keyCode,"enter",13,a.key,"Enter")?null:e.handleInputConfirm(t,i,a)}},model:{value:t.inputVal,callback:function(a){e.$set(t,"inputVal",a)},expression:"item.inputVal"}}):a("el-button",{staticClass:"grouptag el-tag",attrs:{size:"small"},on:{click:function(a){return e.showInput(t,i)}}},[e._v("+ 添加标签")])],2)])}),0)])]),e._v(" "),a("el-dialog",{attrs:{title:"新增标签类型",visible:e.dilogLabelFormVisible,width:"574px"},on:{"update:visible":function(t){e.dilogLabelFormVisible=t}}},[a("el-form",{ref:"addForm",staticClass:"dilogForm",attrs:{model:e.labelForm}},[a("el-form-item",{attrs:{label:"类型名称","label-width":"100px",prop:"tagName",rules:[{required:!0,message:"类型名称不能为空",trigger:["blur"]}]}},[a("el-input",{directives:[{name:"show",rawName:"v-show",value:!1,expression:"false"}],model:{value:e.labelForm.tagName,callback:function(t){e.$set(e.labelForm,"tagName",t)},expression:"labelForm.tagName"}}),e._v(" "),a("gic-input",{attrs:{max:10},model:{value:e.labelForm.tagName,callback:function(t){e.$set(e.labelForm,"tagName",t)},expression:"labelForm.tagName"}})],1),e._v(" "),a("el-form-item",{attrs:{label:"类型描述","label-width":"100px",prop:"tagDescribe",rules:[{required:!0,message:"类型描述不能为空",trigger:["blur"]}]}},[a("el-input",{directives:[{name:"show",rawName:"v-show",value:!1,expression:"false"}],model:{value:e.labelForm.tagDescribe,callback:function(t){e.$set(e.labelForm,"tagDescribe",t)},expression:"labelForm.tagDescribe"}}),e._v(" "),a("gic-textarea",{attrs:{max:100},model:{value:e.labelForm.tagDescribe,callback:function(t){e.$set(e.labelForm,"tagDescribe",t)},expression:"labelForm.tagDescribe"}})],1)],1),e._v(" "),a("div",{staticClass:"dilog-footer",attrs:{slot:"footer"},slot:"footer"},[a("el-button",{on:{click:function(t){e.dilogLabelFormVisible=!1}}},[e._v("取 消")]),e._v(" "),a("el-button",{attrs:{type:"primary"},on:{click:e.AddParentTag}},[e._v("确 定")])],1)],1),e._v(" "),a("el-dialog",{attrs:{title:"新增标签",visible:e.dilogAddFormVisible,width:"574px"},on:{"update:visible":function(t){e.dilogAddFormVisible=t}}},[a("el-form",{ref:"addChildForm",staticClass:"dilogForm",attrs:{model:e.addLabelForm}},[a("el-form-item",{attrs:{label:"标签名称","label-width":"100px",prop:"tagName",rules:[{required:!0,message:"类型描述不能为空",trigger:["blur"]}]}},[a("el-input",{directives:[{name:"show",rawName:"v-show",value:!1,expression:"false"}],model:{value:e.addLabelForm.tagName,callback:function(t){e.$set(e.addLabelForm,"tagName",t)},expression:"addLabelForm.tagName"}}),e._v(" "),a("gic-input",{attrs:{max:10},model:{value:e.addLabelForm.tagName,callback:function(t){e.$set(e.addLabelForm,"tagName",t)},expression:"addLabelForm.tagName"}})],1)],1),e._v(" "),a("div",{staticClass:"dilog-footer",attrs:{slot:"footer"},slot:"footer"},[a("el-button",{on:{click:function(t){e.dilogAddFormVisible=!1}}},[e._v("取 消")]),e._v(" "),a("el-button",{attrs:{type:"primary"},on:{click:e.submitAddLabel}},[e._v("确 定")])],1)],1)],1),e._v(" "),a("div",{staticClass:"foot-add"},[a("vue-gic-footer")],1)])},staticRenderFns:[]};var u=a("VU/8")(d,c,!1,function(e){a("U3e5")},"data-v-2a42e610",null);t.default=u.exports}});
\ No newline at end of file

dist/static/js/manifest.a56f64d242a35206cac2.js

+!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,t,d){for(var f,o,b,i=0,u=[];i<a.length;i++)o=a[i],n[o]&&u.push(n[o][0]),n[o]=0;for(f in t)Object.prototype.hasOwnProperty.call(t,f)&&(e[f]=t[f]);for(c&&c(a,t,d);u.length;)u.shift()();if(d)for(i=0;i<d.length;i++)b=r(r.s=d[i]);return b};var a={},n={36:0};function r(c){if(a[c])return a[c].exports;var n=a[c]={i:c,l:!1,exports:{}};return e[c].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.e=function(e){var c=n[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,r){c=n[e]=[a,r]});c[2]=a;var t=document.getElementsByTagName("head")[0],d=document.createElement("script");d.type="text/javascript",d.charset="utf-8",d.async=!0,d.timeout=12e4,r.nc&&d.setAttribute("nonce",r.nc),d.src=r.p+"static/js/"+e+"."+{0:"bb4258f8b9013814b2b0",1:"9ae4fca59b2f12d29050",2:"0e9de0c75220d9b93d83",3:"a9f5279d0a0215bb8f13",4:"d6dee54c6370e681ff76",5:"695a732f0975076c7793",6:"a9159d5c38776d21405e",7:"931e87fb4be0a2a86a08",8:"75f707fe5d373394dc71",9:"5dd14e9efac1a3ca9cc4",10:"a36cda0ecd1ef7931925",11:"feaa29c4f842002f149b",12:"e480f74c2e5e4f543189",13:"9672a4a11c49a3d0975d",14:"03962cc4834bbd2722d7",15:"e2adb40fea66ffb29d53",16:"4adc26e9a6868a286fca",17:"5d3ca9be69324a791182",18:"1635129c991ec464a422",19:"ce21399c2e08d77c09b9",20:"88cc94fe266509c3c15b",21:"c128986609618c8b1f7e",22:"6d56724e7dd8bb4a3d98",23:"45a3e579bd098c459d6c",24:"1ffec2fdc1e14bd33f41",25:"2c642df35b0aa29dad85",26:"70331a31d0a2372dea41",27:"1dcc3b00cdb379882d16",28:"ee5aadf86d94e8e1c21b",29:"65c8a1083288bb765d1d",30:"1dc5b5848ad8bff185fc",31:"cdc7cb45e9d71d03b029",32:"36cb6b1cf9251c0fce97",33:"4443f2ae8fbc8148ee2a"}[e]+".js";var f=setTimeout(o,12e4);function o(){d.onerror=d.onload=null,clearTimeout(f);var c=n[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return d.onerror=d.onload=o,t.appendChild(d),a},r.m=e,r.c=a,r.d=function(e,c,a){r.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},r.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(c,"a",c),c},r.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},r.p="./",r.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file

src/main.js

@@ -39,6 +39,9 @@ Vue.component('gic-input', gicinput);
 
 axios.interceptors.request.use(
   config => {
+    if (!config.headers.sign && localStorage.getItem('signId')) {
+      config.headers.sign = localStorage.getItem('signId');
+    }
     return config;
   },
   err => {
@@ -48,6 +51,12 @@ axios.interceptors.response.use(
   response => {
     const CODE = response.data.errorCode;
     switch(CODE) {
+      case 0:
+        if (response.data.result && response.data.result.enterpriseId) {
+          let signId = response.data.result.enterpriseId;
+          localStorage.setItem('signId', signId);
+        }
+        break;
       case 401:
         const host = window.location.origin;
         window.location.href = host.indexOf('localhost') > -1 ? 'http://localhost:8002/#/login' : `${host}/gic-web/#/`;

src/mixins/find.js

@@ -18,7 +18,7 @@ function broadcast(componentName, eventName, params) {
 
 export default {
   methods: {
-     派发 向上查找
+    //  派发 向上查找
     dispatch(componentName, eventName, params) {
       let parent = this.$parent || this.$root;
       let name = parent.$options.name;
@@ -33,7 +33,7 @@ export default {
         parent.$emit.apply(parent, [eventName].concat(params));
       }
     },
-     广播 向下查找
+    //  广播 向下查找
     broadcast(componentName, eventName, params) {
       broadcast.call(this, componentName, eventName, params);
     }

src/request/http.js

@@ -4,7 +4,7 @@ import { Message } from 'element-ui';
 
 axios.defaults.baseURL = `${window.location.origin}`;
 axios.defaults.timeout = 10000;
- axios.defaults.headers.post['Content-Type'] = 'appliaction/x-www-form-urlencoded;charset=UTF-8';
+axios.defaults.headers.post['Content-Type'] = 'appliaction/x-www-form-urlencoded;charset=UTF-8';
 
 //  Vue 导入登录token 判断状态
 
@@ -48,7 +48,7 @@ export function getFetch(url, params) {
     axios.get(url, {
       params: params
     }).then(res => {
-      resolve(res.data);
+      resolve(res);
     }).catch(err => {
       reject(err);
     });
@@ -62,7 +62,7 @@ export function getFetch(url, params) {
 export function postFetch(url, params) {
   return new Promise((resolve, reject) => {
     axios.post(url, QS.stringify(params)).then(res => {
-      resolve(res.data);
+      resolve(res);
     }).then(err => {
       reject(err);
     });

src/test/goods/spe-group.vue

@@ -68,6 +68,8 @@ export default {
       treeLeftval: '',
       checkLeft: false,
       checkRight: false,
+      isIndeterminate: false,
+      isRightIndeterminate: false,
       defaultLeftKeys: [], // 左边默认选中
       defaultRightKeys: [], //
       leftMiddleData: [],