Skip to content

W
welfare
Commit 6b76e847 by 萱草
Options

update: UI调整

parent d6fd686f
Showing with 50 additions and 22 deletions
dist/css/chunk-2cc4ec9a.37ae6cf6.css deleted 100644 → 0
.w-480[data-v-47eb2695]{width:480px}
\ No newline at end of file
dist/css/chunk-5d5bbb0f.7a2343bb.css 0 → 100644
.w-480[data-v-2c5a0676]{width:480px}
\ No newline at end of file
dist/css/chunk-6180d1f9.7ff7c769.css deleted 100644 → 0
.w-280[data-v-83f2f180]{width:280px}.w600[data-v-501db6b6]{width:600px}
\ No newline at end of file
dist/css/chunk-96e064be.0673aa96.css deleted 100644 → 0
.w-280[data-v-83f2f180]{width:280px}
\ No newline at end of file
dist/css/chunk-9b9ebe6a.47af1273.css 0 → 100644
.w-280[data-v-2890cc04]{width:280px}.w600[data-v-51f73c4f]{width:600px}.title[data-v-51f73c4f]{height:40px;line-height:40px;background:#f7f8fa}.title[data-v-51f73c4f]:before{clear:both;content:"";display:inline-block;overflow:hidden;width:3px;height:12px;line-height:14px;margin-right:8px;background:#2f54eb}
\ No newline at end of file
dist/css/chunk-cc768a6e.a6cd210f.css 0 → 100644
.w-280[data-v-2890cc04]{width:280px}
\ No newline at end of file
dist/js/chunk-0d4ebdfa.5a05b807.js deleted 100644 → 0
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-0d4ebdfa"],{"48c3":function(t,e,i){"use strict";i.r(e);var a=function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("div",{directives:[{name:"loading",rawName:"v-loading",value:t.loading,expression:"loading"}],staticClass:"p20"},[i("div",{staticClass:"pb20 clearfix flex-center"},[i("el-button",{staticClass:"mlAuto",attrs:{type:"primary"},on:{click:function(e){return t.$router.push("/setting/address-lib-add")}}},[t._v("新建地址")])],1),i("el-table",{staticStyle:{width:"100%"},attrs:{"tooltip-effect":"dark",data:t.tableList}},[i("el-table-column",{attrs:{prop:"contact",label:"联系人"}}),i("el-table-column",{attrs:{prop:"phone",label:"联系方式"}}),i("el-table-column",{attrs:{prop:"address",label:"地址"}}),i("el-table-column",{attrs:{label:"地址类型"},scopedSlots:t._u([{key:"default",fn:function(e){return[e.row.defaultFlag?i("el-tag",{staticClass:"mr5"},[t._v("默认")]):t._e(),t._v("\n "+t._s(1==e.row.type?"退款地址":"--")+"\n ")]}}])}),i("el-table-column",{attrs:{label:"操作"},scopedSlots:t._u([{key:"default",fn:function(e){return[i("el-button",{attrs:{type:"text"},on:{click:function(i){return t.$router.push("/setting/address-lib-edit?id="+e.row.addressId)}}},[t._v("编辑")]),i("dm-delete",{attrs:{tips:"确认删除？"},on:{confirm:function(i){return t.del(e.row)}}},[i("el-button",{attrs:{type:"text"}},[t._v("删除")])],1)]}}])})],1)],1)},s=[],r=i("fab6"),o=i("cdc8"),n=o["a"].getAddressList,d=o["a"].delAddress,l={name:"AddressLibList",mixins:[r["c"]],data:function(){return{loading:!1,listParams:{currentPage:1,pageSize:20},total:0,tableList:[],dialogVisible:!1,addressId:""}},created:function(){this.$emit("updateBread",[{breadName:"福利中心"},{breadName:"通用设置"},{breadName:"地址库管理"}])},mounted:function(){this.getTableList()},methods:{del:function(t){var e=this,i=t.addressId;this.loading=!0,d({addressId:i}).then((function(t){e.loading=!1,e.$tips({type:"success",message:"删除成功"}),e.getTableList()})).finally((function(){e.loading=!1}))},getTableList:function(){var t=this;this.loading||(this.loading=!0,n().then((function(e){t.loading=!1,t.tableList=e.result||[]})).finally((function(){t.loading=!1})))}}},c=l,p=i("2877"),u=Object(p["a"])(c,a,s,!1,null,null,null);e["default"]=u.exports},cdc8:function(t,e,i){"use strict";i("8e6e"),i("ac6a"),i("456d");var a=i("bd86"),s=i("71f6"),r=i("f121");function o(t,e){var i=Object.keys(t);if(Object.getOwnPropertySymbols){var a=Object.getOwnPropertySymbols(t);e&&(a=a.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),i.push.apply(i,a)}return i}function n(t){for(var e=1;e<arguments.length;e++){var i=null!=arguments[e]?arguments[e]:{};e%2?o(Object(i),!0).forEach((function(e){Object(a["a"])(t,e,i[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(i)):o(Object(i)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(i,e))}))}return t}var d={getGiftId:"/gift/get-gift-id",giftGet:"/gift/get",giftSave:{url:"/gift/save",method:"post"},giftUpdate:{url:"/gift/update",method:"post"},giftPage:{url:"/gift/page",method:"post"},giftStockRecord:"/gift/stock-record",giftStockLog:"/gift/stock-record-log",giftActivity:"/gift/activity-statistics",giftTemplateDownload:{url:"/gift/vir-gift-template-download",useFormData:!0,method:"post"},giftTemplateUpload:"/gift/template-upload",giftBatchUpdate:{url:"/gift/batch-update",method:"post"},giftStandardNew:"/gift/spec-save",giftStandardList:"/gift/spec-list",giftStandardValueNew:"/gift/spec-value-save",giftStandardValueList:"/gift/spec-value-list",virtualCardList:"/gift/vir-card-page",batchUpdate:{url:"/gift/batch-update",method:"post"},realCostUpdate:{url:"/gift/real-cost-update",method:"post"},realStockUpdate:{url:"/gift/real-stock-update",method:"post"},getPickupList:"/pickup/get-pickup-list",getGiftShopList:"/gift/get-gift-shop-list",updateName:"/gift/update-name",virtualGiftUpload:{url:"/gift/vir-gift-upload",method:"post",headers:{"Content-Type":"multipart/form-data;"},file:!0},operatorSave:{url:"/auth/operator-save",method:"post"},getOperatorList:"/auth/operator-list",virtualCostUpdate:"/gift/vir-cost-update"},l={updateConfig:{url:"/config/update-config",method:"post",headers:{"Content-Type":"application/json"}},getConfigDetail:"/config/get-config-detail",getAddressList:"/address/get-address-list",getAddressDetails:"/address/get-address-details",delAddress:"/address/del-address",insertOrUpdateAddress:{url:"/address/insert-or-update-address",method:"post",headers:{"Content-Type":"application/json"}},pickupList:"/pickup/get-pickup-list",getPickupDetails:"/pickup/get-pickup-details",delPickup:{url:"/pickup/del-pickup",useFormData:!0,method:"post"},insertPickupStore:{url:"/pickup/insert-pickup-store",method:"post",headers:{"Content-Type":"application/json"}},updatePickupStore:{url:"/pickup/update-pickup-setting",method:"post",headers:{"Content-Type":"application/json"}},exportPickup:"/export-pickup-store-excel"};d=Object(s["a"])(d,r["f"]),l=Object(s["a"])(l,r["f"]),e["a"]=n(n({},d),l);r["c"].api,r["b"],r["c"].api,r["f"]},fab6:function(t,e,i){"use strict";i.d(e,"c",(function(){return s})),i.d(e,"a",(function(){return r})),i.d(e,"b",(function(){return o}));var a=i("ed08"),s={methods:{refresh:function(){this.listParams.currentPage=1,this.getTableList()},handleSizeChange:function(t){this.listParams.pageSize=t,this.getTableList()},handleCurrentChange:function(t){this.listParams.currentPage=t,this.getTableList()}}},r={methods:{formatterTimeFunc:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"startTime",e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"endTime",i=arguments.length>2&&void 0!==arguments[2]?arguments[2]:"yyyy-MM-dd",s=arguments.length>3&&void 0!==arguments[3]?arguments[3]:"dateTime";this[s]?(this.listParams[t]=Object(a["e"])(this[s][0],i),this.listParams[e]=Object(a["e"])(this[s][1],i)):this.listParams[t]=this.listParams[e]=""}}},o={methods:{mainHeight:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:0;return this.$store.state.mainHeight-52-t}}}}}]);
\ No newline at end of file
dist/js/chunk-0d4ebdfa.bbc1795f.js 0 → 100644
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-0d4ebdfa"],{"48c3":function(t,e,i){"use strict";i.r(e);var a=function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("div",{directives:[{name:"loading",rawName:"v-loading",value:t.loading,expression:"loading"}],staticClass:"p20"},[i("div",{staticClass:"pb20 clearfix flex-center"},[i("el-button",{staticClass:"mlAuto",attrs:{type:"primary"},on:{click:function(e){return t.$router.push("/setting/address-lib-add")}}},[t._v("新建地址")])],1),i("el-table",{staticStyle:{width:"100%"},attrs:{"tooltip-effect":"dark",data:t.tableList}},[i("el-table-column",{attrs:{prop:"contact",label:"联系人"}}),i("el-table-column",{attrs:{prop:"phone",label:"联系方式"}}),i("el-table-column",{attrs:{prop:"address",label:"地址","min-width":"120px","show-overflow-tooltip":""}}),i("el-table-column",{attrs:{label:"地址类型"},scopedSlots:t._u([{key:"default",fn:function(e){return[t._v("\n "+t._s(1==e.row.type?"退款地址":"--")+"\n "),e.row.defaultFlag?i("el-tag",{staticClass:"ml5"},[t._v("默认")]):t._e()]}}])}),i("el-table-column",{attrs:{label:"操作"},scopedSlots:t._u([{key:"default",fn:function(e){return[i("el-button",{attrs:{type:"text"},on:{click:function(i){return t.$router.push("/setting/address-lib-edit?id="+e.row.addressId)}}},[t._v("编辑")]),i("dm-delete",{attrs:{tips:"确认删除？"},on:{confirm:function(i){return t.del(e.row)}}},[i("el-button",{attrs:{type:"text"}},[t._v("删除")])],1)]}}])})],1)],1)},s=[],r=i("fab6"),o=i("cdc8"),n=o["a"].getAddressList,d=o["a"].delAddress,l={name:"AddressLibList",mixins:[r["c"]],data:function(){return{loading:!1,listParams:{currentPage:1,pageSize:20},total:0,tableList:[],dialogVisible:!1,addressId:""}},created:function(){this.$emit("updateBread",[{breadName:"福利中心"},{breadName:"通用设置"},{breadName:"地址库管理"}])},mounted:function(){this.getTableList()},methods:{del:function(t){var e=this,i=t.addressId;this.loading=!0,d({addressId:i}).then((function(t){e.loading=!1,e.$tips({type:"success",message:"删除成功"}),e.getTableList()})).finally((function(){e.loading=!1}))},getTableList:function(){var t=this;this.loading||(this.loading=!0,n().then((function(e){t.loading=!1,t.tableList=e.result||[]})).finally((function(){t.loading=!1})))}}},p=l,c=i("2877"),u=Object(c["a"])(p,a,s,!1,null,null,null);e["default"]=u.exports},cdc8:function(t,e,i){"use strict";i("8e6e"),i("ac6a"),i("456d");var a=i("ade3"),s=i("71f6"),r=i("f121");function o(t,e){var i=Object.keys(t);if(Object.getOwnPropertySymbols){var a=Object.getOwnPropertySymbols(t);e&&(a=a.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),i.push.apply(i,a)}return i}function n(t){for(var e=1;e<arguments.length;e++){var i=null!=arguments[e]?arguments[e]:{};e%2?o(Object(i),!0).forEach((function(e){Object(a["a"])(t,e,i[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(i)):o(Object(i)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(i,e))}))}return t}var d={getGiftId:"/gift/get-gift-id",giftGet:"/gift/get",giftSave:{url:"/gift/save",method:"post"},giftUpdate:{url:"/gift/update",method:"post"},giftPage:{url:"/gift/page",method:"post"},giftStockRecord:"/gift/stock-record",giftStockLog:"/gift/stock-record-log",giftActivity:"/gift/activity-statistics",giftTemplateDownload:{url:"/gift/vir-gift-template-download",useFormData:!0,method:"post"},giftTemplateUpload:"/gift/template-upload",giftBatchUpdate:{url:"/gift/batch-update",method:"post"},giftStandardNew:"/gift/spec-save",giftStandardList:"/gift/spec-list",giftStandardValueNew:"/gift/spec-value-save",giftStandardValueList:"/gift/spec-value-list",virtualCardList:"/gift/vir-card-page",batchUpdate:{url:"/gift/batch-update",method:"post"},realCostUpdate:{url:"/gift/real-cost-update",method:"post"},realStockUpdate:{url:"/gift/real-stock-update",method:"post"},getPickupList:"/pickup/get-pickup-list",getGiftShopList:"/gift/get-gift-shop-list",updateName:"/gift/update-name",virtualGiftUpload:{url:"/gift/vir-gift-upload",method:"post",headers:{"Content-Type":"multipart/form-data;"},file:!0},operatorSave:{url:"/auth/operator-save",method:"post"},getOperatorList:"/auth/operator-list",virtualCostUpdate:"/gift/vir-cost-update"},l={updateConfig:{url:"/config/update-config",method:"post",headers:{"Content-Type":"application/json"}},getConfigDetail:"/config/get-config-detail",getAddressList:"/address/get-address-list",getAddressDetails:"/address/get-address-details",delAddress:"/address/del-address",insertOrUpdateAddress:{url:"/address/insert-or-update-address",method:"post",headers:{"Content-Type":"application/json"}},pickupList:"/pickup/get-pickup-list",getPickupDetails:"/pickup/get-pickup-details",delPickup:{url:"/pickup/del-pickup",useFormData:!0,method:"post"},insertPickupStore:{url:"/pickup/insert-pickup-store",method:"post",headers:{"Content-Type":"application/json"}},updatePickupStore:{url:"/pickup/update-pickup-setting",method:"post",headers:{"Content-Type":"application/json"}},exportPickup:"/export-pickup-store-excel"};d=Object(s["a"])(d,r["f"]),l=Object(s["a"])(l,r["f"]),e["a"]=n(n({},d),l);r["c"].api,r["b"],r["c"].api,r["f"]},fab6:function(t,e,i){"use strict";i.d(e,"c",(function(){return s})),i.d(e,"a",(function(){return r})),i.d(e,"b",(function(){return o}));var a=i("ed08"),s={methods:{refresh:function(){this.listParams.currentPage=1,this.getTableList()},handleSizeChange:function(t){this.listParams.pageSize=t,this.getTableList()},handleCurrentChange:function(t){this.listParams.currentPage=t,this.getTableList()}}},r={methods:{formatterTimeFunc:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"startTime",e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"endTime",i=arguments.length>2&&void 0!==arguments[2]?arguments[2]:"yyyy-MM-dd",s=arguments.length>3&&void 0!==arguments[3]?arguments[3]:"dateTime";this[s]?(this.listParams[t]=Object(a["e"])(this[s][0],i),this.listParams[e]=Object(a["e"])(this[s][1],i)):this.listParams[t]=this.listParams[e]=""}}},o={methods:{mainHeight:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:0;return this.$store.state.mainHeight-52-t}}}}}]);
\ No newline at end of file
dist/js/chunk-2cc4ec9a.231dc619.js → dist/js/chunk-5d5bbb0f.66f4c11d.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/chunk-vendors.e1d4da3a.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/chunk-vendors.f7b52046.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/gic-card.2c5b1e81.js → dist/js/gic-card.45090f89.js
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/stock-list/welfare-item.vue
......@@ -5,7 +5,7 @@
<label>福利ID：</label><span>{{ welfareId }}</span>
<label>更新时间：</label><span v-html="formatDateTimeByType(info.updateTime)"></span>
<label>创建时间：</label><span v-html="formatDateTimeByType(info.createTime)"></span>
<span class="btn" @click="dialogVisible = true">活动记录<i class="el-icon-arrow-right ml5"></i></span>
<span class="btn" @click="dialogVisible = true">活动统计<i class="el-icon-arrow-right ml5"></i></span>
</div>
<div class="content">
<div class="f1">
......
src/views/gift-manage/address-lib-form.vue
......@@ -10,11 +10,11 @@
<el-switch :active-value="1" :inactive-value="0" v-model="ruleForm.defaultFlag"></el-switch>
</el-form-item>
<el-form-item prop="contact" label="联系人">
<el-input v-model="ruleForm.contact" :maxlength="20" show-word-limit></el-input>
<el-input v-model="ruleForm.contact" :maxlength="20" show-word-limit placeholder="请输入联系人姓名"></el-input>
</el-form-item>
<el-form-item prop="phone" label="手机号">
<!-- <dm-input-phone style="width:100%;" v-model="ruleForm.phone" show-word-limit></dm-input-phone> -->
<el-input v-model="ruleForm.phone" type="text" class="w-480">
<el-input v-model="ruleForm.phone" type="text" class="w-480" placeholder="请输入手机号">
<el-select v-model="areaCode" slot="prepend" placeholder="请选择" style="width:90px">
<el-option :label="`+` + `${item.code}`" :value="item.code" v-for="(item, index) in areaCodeList" :key="index"></el-option>
</el-select>
......
src/views/gift-manage/address-lib-list.vue
......@@ -6,11 +6,11 @@
<el-table tooltip-effect="dark" :data="tableList" style="width:100%">
<el-table-column prop="contact" label="联系人"> </el-table-column>
<el-table-column prop="phone" label="联系方式"> </el-table-column>
<el-table-column prop="address" label="地址"> </el-table-column>
<el-table-column prop="address" label="地址" min-width="120px" show-overflow-tooltip> </el-table-column>
<el-table-column label="地址类型">
<template slot-scope="scope">
<el-tag v-if="scope.row.defaultFlag" class="mr5">默认</el-tag>
{{ scope.row.type == 1 ? '退款地址' : '--' }}
<el-tag v-if="scope.row.defaultFlag" class="ml5">默认</el-tag>
</template>
</el-table-column>
<el-table-column label="操作">
......
src/views/gift-manage/module/pickup-form-content.vue
......@@ -2,8 +2,8 @@
<div>
<el-form-item label="买家可选自提时间">
<el-switch v-model="ruleForm.chooseTimeFlag" :active-value="1" :inactive-value="0"></el-switch>
<p>若不开启，则默认会员可在任意时间提货</p>
<p>若开启，表示买家可选择自提时间，商户需按约定时间备货完成</p>
<p style="font-size:12px;color:#909399">若不开启，则默认会员可在任意时间提货</p>
<p style="font-size:12px;color:#909399">若开启，表示买家可选择自提时间，商户需按约定时间备货完成</p>
</el-form-item>
<template v-if="ruleForm.chooseTimeFlag">
<el-form-item label="日期类型" required>
......
src/views/gift-manage/pickup-form.vue
<template>
<div class="p20" v-loading="loading">
<el-form :model="ruleForm" ref="ruleForm" :rules="rules" label-width="160px">
<h3 class="pb20">自提点信息</h3>
<h3 class="pb20 title mb30">自提点信息</h3>
<el-form-item label="自提点类型">
<el-radio v-model="ruleForm.type" :label="1">从门店中选择</el-radio>
</el-form-item>
......@@ -33,7 +33,7 @@
</el-form-item>
</template>
<h3 class="pt20 pb20">自提点设置</h3>
<h3 class="pb20 title mb30">自提点设置</h3>
<form-content :rule-form.sync="ruleForm"></form-content>
<el-form-item class="mt20">
<el-button @click="handleSubmit()" type="primary">{{ isAdd ? '确认新建' : '保存' }}</el-button>
......@@ -238,4 +238,21 @@ export default {
.w600 {
width: 600px;
}
.title{
height: 40px;
line-height: 40px;
background: #F7F8FA;
}
.title::before{
clear: both;
content: "";
display: inline-block;
/* // height: 0; */
overflow: hidden;
width: 3px;
height: 12px;
line-height: 14px;
margin-right: 8px;
background: #2F54EB;
}
</style>
\ No newline at end of file
src/views/gift-manage/pickup-list.vue
<template>
<div class="p20" v-loading="loading">
<div class="pb20 clearfix flex-center">
<el-input prefix-icon="el-icon-search" v-model="listParams.name" @change="refresh" class="w400 mrAuto" clearable placeholder="请输入自提点名称进行搜索"></el-input>
<el-select class="more-select mr10" @change="mutiOption" placeholder="批量操作">
<el-input prefix-icon="el-icon-search" v-model="listParams.name" @change="refresh" class="w260 mrAuto" clearable placeholder="请输入自提点名称进行搜索"></el-input>
<el-select class="more-select w160 mr10" @change="mutiOption" placeholder="批量操作">
<el-option :disabled="!selectList.length" :value="0">批量设置</el-option>
<el-option :disabled="!selectList.length" :value="1">批量删除</el-option>
</el-select>
<el-button type="default" @click="exportExcel">导出自提点</el-button>
<el-button type="default" @click="exportExcel"><i class="iconfont-welfare4 icon-xiazai"></i>&nbsp;导出</el-button>
<el-button type="primary" @click="$router.push('/setting/pickup-add')">新建自提点</el-button>
</div>
<el-table tooltip-effect="dark" :data="tableList" style="width:100%" @selection-change="(list) => { selectList = list; }">
......@@ -16,7 +16,7 @@
<el-table-column label="联系电话" prop="phone" min-width="140px;"> </el-table-column>
<el-table-column label="自提时间可选" min-width="120px;">
<template slot-scope="scope">
{{ scope.row.chooseTimeFlag ? '可选' : '不可选' }}
{{ scope.row.chooseTimeFlag ? '是' : '否' }}
</template>
</el-table-column>
<el-table-column label="操作">
......
src/views/gift-manage/real-gift-detail.vue
......@@ -99,7 +99,13 @@
</div>
</template>
<template v-slot:header>
<span>成本</span>
<!-- <span>成本</span> -->
<el-tooltip open-delay="200" effect="dark" style="width:250px" placement="top">
<span class="undeline-dash">成本(元)</span>
<span slot="content">
若SKU的成本未填写则按照SPU价格计算
</span>
</el-tooltip>
<el-popover placement="top" trigger="click" ref="popover3">
<div>
<dm-input-amount v-model.trim="handleData.giftSkuCostPrice" width="140" style="margin-left:-2px;" controls-position="right" precision="2" :min="0" :max="999999.99"></dm-input-amount>
......@@ -1676,6 +1682,10 @@ export default {
}
}
}
.undeline-dash{
border-bottom: 1px dashed #2F54EB;
font-weight:500;
}
.from-content .see-btn {
color: #909399;
margin-left: 15px;
......
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