Skip to content

I
integral-mall
Commit 5f37f5b8 by damodmg
Options

add新功能

parent e7a9d6e8
Showing with 353 additions and 24 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>积分商城</title><link href=./static/css/app.c59732585a037ce3398a2b868ac2b6f4.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.20.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.05.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.03.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.04.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.2a66e15144de1c0f565b.js></script><script type=text/javascript src=./static/js/app.b68de82f60ec8fe0bf79.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>积分商城</title><link href=./static/css/app.dc304c372fa862098c527c47b1721c49.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.20.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.05.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.03.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.04.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.bf93010d9b9b1322a27b.js></script><script type=text/javascript src=./static/js/app.0446b669186f77695fd7.js></script></body></html>
\ No newline at end of file
dist/static/css/app.c59732585a037ce3398a2b868ac2b6f4.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.dc304c372fa862098c527c47b1721c49.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/iconfont.css
......@@ -40,10 +40,6 @@
content: "\e635";
}
.icon-tupian:before {
content: "\e616";
}
.icon-lipin:before {
content: "\e78a";
}
......@@ -56,6 +52,10 @@
content: "\e615";
}
.icon-shezhi:before {
content: "\e663";
}
.icon-xinxixianshi:before {
content: "\e74f";
}
......
dist/static/fonts/iconfont.svg
......@@ -38,9 +38,6 @@ Created by iconfont
<glyph glyph-name="shangpin" unicode="&#58933;" d="M891.303669 896h-759.406713C59.153786 896 0 836.846214 0 764.103044v-760.206088c0-72.743169 59.153786-131.896956 131.896956-131.896956h760.206088c72.743169 0 131.896956 59.153786 131.896956 131.896956V764.103044C1023.200625 836.846214 964.046838 896 891.303669 896zM73.542545 647.394223c18.385636-9.592506 38.370023-14.388759 58.354411-14.388759h760.206088c19.984387 0 39.968774 4.796253 58.354411 14.388759v-642.697892c0-31.97502-26.379391-58.354411-58.354411-58.354411H131.896956c-31.97502 0-58.354411 26.379391-58.354411 58.354411V647.394223z m817.761124 58.354411h-759.406713c-31.97502 0-58.354411 26.379391-58.354411 58.35441s26.379391 58.354411 58.354411 58.354411h760.206088c31.97502 0 58.354411-26.379391 58.354411-58.354411-0.799375-31.97502-26.379391-58.354411-59.153786-58.35441zM224.624512 367.612802c19.185012-143.887588 141.489461-251.803279 286.9758-251.803278s268.590164 107.915691 286.9758 251.803278c21.583138 11.990632 34.373146 34.373146 34.373146 59.153787 0 37.570648-30.376269 67.946916-67.946916 67.946916s-67.946916-30.376269-67.946917-67.946916c0-21.583138 10.391881-42.366901 27.978143-55.156909C708.246682 266.891491 617.117877 188.552693 511.600312 188.552693s-196.64637 78.338798-213.433255 183.056987c17.586261 12.790008 27.978142 33.57377 27.978142 55.156909 0 37.570648-30.376269 67.946916-67.946916 67.946916s-67.946916-30.376269-67.946917-67.946916c0-24.78064 12.790008-47.163154 34.373146-59.153787z" horiz-adv-x="1024" />
<glyph glyph-name="tupian" unicode="&#58902;" d="M324.3 358.9c-57.9 0-105 47.1-105 105s47.1 105 105 105 105-47.1 105-105-47.1-105-105-105z m0 168c-34.7 0-63-28.3-63-63s28.3-63 63-63 63 28.3 63 63-28.3 63-63 63zM560.1-5.5c-5.4 0-10.7 2.1-14.8 6.2L344.9 201c-10.2 10.2-26.9 10.2-37.1 0L163.1 56.3c-8.2-8.2-21.5-8.2-29.7 0s-8.2 21.5 0 29.7l144.7 144.7c26.6 26.6 69.9 26.6 96.5 0L575 30.3c8.2-8.2 8.2-21.5 0-29.7-4.1-4.1-9.5-6.1-14.9-6.1zM414 150.3c-5.4 0-10.7 2.1-14.8 6.2-8.2 8.2-8.2 21.5 0 29.7l248.3 248.3c31 31 81.5 31 112.4 0l144.3-144.3c8.2-8.2 8.2-21.5 0-29.7s-21.5-8.2-29.7 0L730.2 404.7c-14.6 14.6-38.4 14.6-53.1 0L428.9 156.5c-4.1-4.1-9.5-6.2-14.9-6.2zM806-15H218c-57.9 0-105 47.1-105 105V678c0 57.9 47.1 105 105 105h588c57.9 0 105-47.1 105-105v-588c0-57.9-47.1-105-105-105zM218 741c-34.7 0-63-28.3-63-63v-588c0-34.7 28.3-63 63-63h588c34.7 0 63 28.3 63 63V678c0 34.7-28.3 63-63 63H218z" horiz-adv-x="1024" />
<glyph glyph-name="lipin" unicode="&#59274;" d="M867.54211 618.19181h-51.287083l8.377808 12.262278c12.262278 18.388812 24.520463 49.04195 18.388812 73.56139 0 24.51637-18.388812 49.036833-36.779671 61.301157-30.652114 18.388812-61.299111 18.388812-98.083899 12.257162-73.558319-18.389836-147.120732-79.68997-190.030008-140.989081l-6.132674-6.131651-6.126534 6.131651C462.959585 697.88485 389.398196 759.184985 315.83476 777.57482c-36.779671 12.262278-67.431785 6.130627-98.078783-12.257161-24.520463-12.264325-36.779671-36.783765-36.779671-61.301158 0-24.520463 6.126534-49.04195 18.388812-73.56139l6.636141-12.262278h-49.546439c-42.909276 0-73.562413-30.648021-73.562413-73.558319v-125.059274c0-30.652114 24.520463-61.299111 55.168484-67.430762V23.60793c0-42.909276 30.652114-73.561389 73.563436-73.56139h300.371068v-0.005116h300.377208c42.911322 0 73.558319 30.652114 73.55832 73.562413V315.35355c0 12.259208-0.402159 36.783765-0.40216 36.783765h6.533811c24.520463 6.131651 49.04195 36.779671 49.041949 67.430762V544.63349c0.001023 42.910299-30.652114 73.558319-73.562413 73.55832zM247.995699 724.858178c20.23281 15.017018 38.60832 9.81146 61.918211 3.979638C359.030561 711.687204 393.106658 678.658973 438.500521 638.114558l22.415522-21.559015H268.729929c-17.483186 23.312962-35.890418 47.548946-35.890418 76.689637-0.001023 17.483186 3.501754 19.956517 15.156188 31.612998zM136.968 441.401338v91.212398c0 17.655102 17.649985 35.305087 35.305087 35.305087h313.856197v-161.823596H172.273087c-23.539112 0-35.305087 17.649985-35.305087 35.306111zM486.92337 1.532145H220.53937c-22.733771 0-34.099632 11.368932-34.099632 34.102703V318.042799c0 17.052374 17.052374 34.104749 34.104749 34.104749H486.92337v-350.615403z m93.225241 631.372761c34.651194 34.640961 82.243119 71.724555 138.027634 94.402044 23.090904 5.77247 36.166711 4.90573 59.463299-6.126534 10.420327-9.81146 14.090926-15.172561 14.090927-32.489972 0-23.096021-22.522969-54.402027-39.842427-71.725578H565.537845l14.610766 15.94004z m257.409605-597.270058c0-17.052374-17.051351-34.102702-34.102703-34.102703h-261.4752v350.615403h261.4752c17.056468 0 34.102702-17.056468 34.102703-34.104749v-282.407951z m47.049572 405.030733c0-17.897625-17.897625-35.800367-35.795251-35.800368H540.282648V569.14986h308.529889c17.892509 0 35.795251-17.902742 35.795251-35.802414v-92.681865z" horiz-adv-x="1024" />
......@@ -50,6 +47,9 @@ Created by iconfont
<glyph glyph-name="daifahuo" unicode="&#58901;" d="M329.318 324.833c15.114 0 27.361 12.268 27.361 27.341V502.149c0 15.114-12.247 27.361-27.361 27.361s-27.341-12.247-27.341-27.361v-122.593h-117.74c-15.135 0-27.361-12.268-27.361-27.382 0-15.073 12.227-27.341 27.361-27.341h145.08zM721.244 214.835c-73.605 0-134.717-54.415-145.285-125.092H448.983c-10.547 70.676-71.66 125.092-145.244 125.092-80.978 0-146.862-65.884-146.862-146.883 0-80.957 65.884-146.862 146.862-146.862 69.652 0 128.143 48.742 143.135 113.91h131.195c14.991-65.188 73.523-113.91 143.155-113.91 80.957 0 146.842 65.905 146.842 146.862 0.02 80.998-65.864 146.883-146.821 146.883zM303.739-24.207c-50.811 0-92.16 41.37-92.16 92.16s41.349 92.16 92.16 92.16 92.16-41.37 92.16-92.16-41.349-92.16-92.16-92.16z m417.505 0c-50.811 0-92.14 41.37-92.14 92.16s41.329 92.16 92.14 92.16c50.77 0 92.14-41.37 92.14-92.16s-41.37-92.16-92.14-92.16zM1003.418 751.186c-2.191 29.635-14.029 54.129-34.243 70.82-33.26 27.464-77.578 25.395-88.023 24.453l-485.028-0.819c-38.953 0-60.908-15.626-72.458-28.754-23.04-26.132-21.914-59.802-21.094-69.12v-93.614l-222.72-117.76c-51.589-22.303-58.88-87.06-59.167-89.825a26.218 26.218 0 0 1-0.143-2.826l-0.061-375.849c0-15.114 12.247-27.341 27.341-27.341 15.114 0 27.361 12.227 27.361 27.32l0.061 373.965c1.004 6.144 6.84 36.311 26.808 44.564a24.372 24.372 0 0 1 2.335 1.085l238.305 125.993a27.361 27.361 0 0 1 14.561 24.207V749.158c0 1.311 0 2.089-0.184 3.359-0.492 5.12-0.041 19.702 7.782 28.426 6.001 6.636 16.486 9.994 31.293 9.994h0.061l486.339 0.819c1.044 0 2.109 0.041 3.133 0.184 0.266 0.02 30.597 2.785 48.62-12.104 8.479-7.004 13.23-17.388 14.479-31.724v-680.12c0-15.094 12.227-27.341 27.341-27.341s27.402 12.206 27.402 27.3V749.157a33.572 33.572 0 0 1-0.102 2.028z" horiz-adv-x="1024" />
<glyph glyph-name="shezhi" unicode="&#58979;" d="M245.921684 33.684211a107.789474 107.789474 0 0 0 208.788211 0H916.210526a26.947368 26.947368 0 1 0 0-53.894737H454.709895a107.789474 107.789474 0 0 0-208.788211 0H107.789474a26.947368 26.947368 0 1 0 0 53.894737h138.13221z m377.263158 377.263157a107.789474 107.789474 0 0 0 208.788211 0H916.210526a26.947368 26.947368 0 1 0 0-53.894736h-84.237473a107.789474 107.789474 0 0 0-208.788211 0H107.789474a26.947368 26.947368 0 1 0 0 53.894736h515.395368z m-377.263158 377.263158a107.789474 107.789474 0 0 0 208.788211 0H916.210526a26.947368 26.947368 0 1 0 0-53.894737H454.709895a107.789474 107.789474 0 0 0-208.788211 0H107.789474a26.947368 26.947368 0 0 0 0 53.894737h138.13221zM350.315789 707.368421a53.894737 53.894737 0 1 1 0 107.789474 53.894737 53.894737 0 0 1 0-107.789474z m377.263158-377.263158a53.894737 53.894737 0 1 1 0 107.789474 53.894737 53.894737 0 0 1 0-107.789474z m-377.263158-377.263158a53.894737 53.894737 0 1 1 0 107.789474 53.894737 53.894737 0 0 1 0-107.789474z" horiz-adv-x="1024" />
<glyph glyph-name="xinxixianshi" unicode="&#59215;" d="M486.4 477.696h68.096V128H486.4V477.696zM512-42.496c239.104 0 426.496 187.904 426.496 426.496S751.104 810.496 512 810.496 85.504 623.104 85.504 384s187.392-426.496 426.496-426.496z m0-85.504C230.4-128 0 102.4 0 384S230.4 896 512 896s512-230.4 512-512-230.4-512-512-512zM520.704 568.32m-51.2 0a51.2 51.2 0 1 1 102.4 0 51.2 51.2 0 1 1-102.4 0Z" horiz-adv-x="1024" />
......
dist/static/js/app.0446b669186f77695fd7.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.b68de82f60ec8fe0bf79.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/vendor.2a66e15144de1c0f565b.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/vendor.bf93010d9b9b1322a27b.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/router/index.js
......@@ -9,7 +9,9 @@ import couponInfo from '../views/goods/coupon/info';
import giftExchange from '../views/order/giftExchange';
import couponExchange from '../views/order/couponExchange';
import refundList from '../views/order/refundList';
import deliverSet from '../views/setting/deliverSet';
import editDeliver from '../views/setting/editDeliver';
import orderDetail from '../views/order/orderDetail';
Vue.use(VueClipboard);
const router = new Router({
......@@ -45,6 +47,11 @@ const router = new Router({
component: giftExchange
},
{
path: '/orderDetail',
name: 'orderDetail',
component: orderDetail
},
{
path: '/couponExchange',
name: 'couponExchange',
component: couponExchange
......@@ -53,6 +60,16 @@ const router = new Router({
path: '/refundList',
name: 'refundList',
component: refundList
},
{
path: '/deliverSet',
name: 'deliverSet',
component: deliverSet
},
{
path: '/editDeliver',
name: 'editDeliver',
component: editDeliver
}
]
}
......
src/views/goods/gift/info.vue
......@@ -95,6 +95,13 @@
<el-form-item label="礼品成本" prop="costValue">
<el-input-number class="w-350" :precision="2" :min="0" v-model="giftForm.costValue" :disabled="costValueStatus"></el-input-number>
</el-form-item>
<el-form-item label="市场价">
<el-input-number class="w-350" :precision="2" :min="0" :max="9999999" v-model="giftForm.marketPrice"></el-input-number>
<el-popover placement="top-start" width="200" trigger="hover">
<img src="../../../../static/img/eg.png" alt="" />
<el-button slot="reference" type="text" style="margin-left:15px;">查看示例</el-button>
</el-popover>
</el-form-item>
</div>
<div class="section-content">
<h3>图文信息</h3>
......@@ -179,13 +186,31 @@
<el-form-item class="form-item-mt" v-if="giftForm.releaseType === 2" prop="limitTimeBegin">
<el-date-picker v-model="giftForm.limitTimeBegin" type="datetime" placeholder="选择日期时间"> </el-date-picker>
</el-form-item>
<el-form-item label="配送方式" required>
<!-- 实物礼品 -->
<el-form-item label="配送方式" required v-if="giftType === 1">
<el-checkbox-group v-model="giftForm.changeTypeList" :disabled="editChangeTypeStatus" @change="handleStatus">
<el-checkbox label="2">快递发货</el-checkbox>
<el-checkbox v-if="giftForm.changeType === 1" label="1">微信兑换券</el-checkbox>
<el-checkbox v-if="giftForm.changeType !== 1" label="4">门店自提</el-checkbox>
</el-checkbox-group>
</el-form-item>
<!-- 虚拟礼品 -->
<el-form-item label="配送方式" required v-else>
<el-radio-group v-model="giftForm.changeType" @change="changeDeliver" :disabled="editChangeTypeStatus">
<el-radio :label="3">在线发货 </el-radio>
<el-radio :label="1">微信兑换券</el-radio>
</el-radio-group>
</el-form-item>
<!-- <el-form-item label="配送方式" required>
<el-radio-group v-model="giftForm.changeType" @change="changeDeliver" :disabled="editChangeTypeStatus">
<el-radio :label="2" v-if="giftType === 1">快递发货</el-radio>
<el-radio :label="3" v-if="giftType === 0">在线发货</el-radio>
<el-radio :label="1">微信兑换券</el-radio>
</el-radio-group>
</el-form-item>
</el-form-item> -->
<div class="section-content1" v-show="giftForm.changeType === 1">
<h3>选择卡券</h3>
<el-form-item label="选择卡券" required v-show="mallProId === '-1'" style="margin-bottom:66px;">
......@@ -245,6 +270,14 @@
<addCate :addCateModal="addCateModal" @getCategoryOptions="getCategoryOptions"></addCate>
<!-- 卡券选择弹框 -->
<vue-gic-card :disabledList="disabledList" :projectName="projectName" :showCardDialog="showCardDialog" :cardLimit="cardLimit" :cardType="cardType" @selectCard="selectCard" ref="dmcard"></vue-gic-card>
<!-- 跳转链接 -->
<el-dialog title="提示" :visible.sync="dialogVisibleLink" width="400px">
<p style="margin-bottom:22px;">需先开启门店自提服务后方可生效，请先<el-button type="text" @click="goDeliverSet">前往设置</el-button></p>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisibleLink = false">取 消</el-button>
<el-button type="primary" @click="goDeliverSet">确 定</el-button>
</span>
</el-dialog>
</div>
</template>
......@@ -293,8 +326,10 @@ export default {
releaseType: 1, //上架时间
limitTimeBegin: '', //上架时间具体
changeType: 1, //配送方式T
changeTypeList: [], //配东方式
refundType: 0, //是否允许退款
costValue: '', //礼品成本
marketPrice: '', //市场价
proCode: '', //编码
integralCost: '', //积分
cashCost: '', //现金
......@@ -356,7 +391,8 @@ export default {
couponCostValue: 0, //兑换券成本
couponCardStock: 0, //兑换券库存
costValueStatus: false
costValueStatus: false,
dialogVisibleLink: false
// proReferId: ''
};
},
......@@ -581,12 +617,21 @@ export default {
this.giftForm.limitTimeBegin = '';
}
//配送方式
this.giftForm.changeType = res.data.result.changeType;
if (res.data.result.giftType === 1) {
//实物礼品
this.giftForm.changeType = Number(res.data.result.changeType);
this.giftForm.changeTypeList = String(this.giftForm.changeType).split(',');
} else if (res.data.result.giftType === 0) {
//虚拟礼品
this.giftForm.changeType = Number(res.data.result.changeType);
}
if (this.giftForm.changeType === 1) {
this.refundTypeStatus = true;
} else {
this.refundTypeStatus = false;
}
this.giftForm.refundType = res.data.result.refundType;
if (this.giftForm.changeType === 1) {
//微信兑换券
......@@ -920,6 +965,28 @@ export default {
this.cardList = [];
}
},
// 勾选自提点
handleStatus() {
request.get('/api-integral-mall/pick-up-point-switch-status').then(res => {
if (res.data.errorCode === 0) {
if (res.data.result.status === 0) {
//0关闭1开启
this.dialogVisibleLink = true;
for (let i = 0; i < this.giftForm.changeTypeList.length; i++) {
if (this.giftForm.changeTypeList[i] === '4') {
this.giftForm.changeTypeList.splice(i, 1);
}
}
}
} else {
this.$message.error(res.data.message);
}
});
},
// 跳转到设置自提点
goDeliverSet() {
this.$router.push({ name: 'editDeliver' });
},
// 获取规格列表
getStandradList(val) {
this.giftProStandardJson = val;
......@@ -1169,13 +1236,14 @@ export default {
proCode: this.giftForm.proCode, //编码
proCodeQuery: this.giftForm.proCodeQuery, //条形码
costValue: this.giftForm.changeType === 1 ? this.couponCostValue : this.giftForm.costValue, //卡券礼品成本
marketPrice: this.giftForm.marketPrice, //市场价
// cashCost: this.giftForm.costValue, //礼品成本
virtualStock: this.giftForm.virtualStock, //库存
timeZones: '', //部分时段
proShowStatus: this.giftForm.proShowStatus, //显示状态
releaseType: this.giftForm.releaseType, //上架状态
limitTimeBegin: this.giftForm.releaseType === 2 ? this.getTimeAll(this.giftForm.limitTimeBegin) : '', //定时上架时间
changeType: this.giftForm.changeType, //配送方式
changeType: this.giftForm.changeTypeList.join(','), //配送方式
// proReferId: this.giftForm.changeType === 1 ? this.proReferId : '', //微信兑换券
refundType: this.giftForm.refundType, //售后
giftProStandardJson: this.giftProStandardJson ? JSON.stringify(this.giftProStandardJson) : '', //规格列表
......
src/views/order/giftExchange.vue
......@@ -23,6 +23,7 @@
<el-select v-model="changeType" placeholder="配送方式" clearable @change="getListCurr" style="width:160px;">
<el-option label="物流发货" :value="2"></el-option>
<el-option label="在线发货（虚拟商品）" :value="3"></el-option>
<el-option label="门店自提" :value="4"></el-option>
</el-select>
</div>
<div class="search-item">
......@@ -67,7 +68,10 @@
<el-table-column prop="definedCode" label="订单编号">
<template slot-scope="scope">
<el-dropdown @visible-change="i => getOrderInfo(i, scope.row.integralMallProExchangeId)" trigger="click" class="drop-list">
<span class="el-dropdown-link"> {{ scope.row.definedCode }}<i class="iconfont icon-icon-"></i> </span>
<span class="el-dropdown-link">
<span class="go-link" @click="goDetail(scope.row)">{{ scope.row.definedCode }}</span
><i class="iconfont icon-icon-"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="orderInfo.definedCode">订单编号：{{ orderInfo.orderNumber }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">商户支付号：{{ orderInfo.merchantNumber }}</el-dropdown-item>
......@@ -100,13 +104,14 @@
<span v-if="scope.row.status <= 0">交易关闭</span>
</p>
<p style="line-height:18px">
<!-- <el-button type="text" @click="goDetail(scope.row)">订单详情</el-button> -->
<el-button type="text" v-if="scope.row.status === 1 && scope.row.changeType === 2" @click="handleDeliver(scope.row)">物流发货</el-button>
<el-button type="text" v-if="scope.row.status === 1 && scope.row.changeType === 3" @click="handleDeliver(scope.row)">在线发货</el-button>
<el-button type="text" v-if="scope.row.status === 3" @click="getDeliverInfo(scope.row)">查看物流</el-button>
<el-button type="text" v-if="scope.row.status === 1 && scope.row.refundStatus !== 2" @click="closeOrder(scope.row)">关闭订单</el-button>
<!-- 待付款关闭订单 -->
<el-button type="text" v-if="scope.row.status === 11 && scope.row.refundStatus !== 2" @click="closeOrderNoPay(scope.row)">关闭订单</el-button>
<el-button type="text" v-if="scope.row.status === 11" @click="closeOrderNoPay(scope.row)">关闭订单</el-button>
<el-button type="text" v-if="scope.row.status <= 0" @click="getCloseInfo(scope.row)">查看详情</el-button>
</p>
</template>
......@@ -651,6 +656,10 @@ export default {
this.editStatus = false;
this.deliverInfodModal.dialogVisible = false;
this.deliverInfodModal.dialogVisible = false;
},
// 进入订单详情
goDetail(item) {
this.$router.push({ name: 'orderDetail', query: { integralMallProExchangeId: item.integralMallProExchangeId } });
}
},
components: {
......@@ -713,6 +722,11 @@ export default {
.pagination-conteiner {
padding: 30px 16px 34px 0;
}
.go-link {
color: #1890ff;
cursor: pointer;
}
.drop-list .icon-icon- {
color: #909399;
margin-left: 5px;
......
src/views/setting/deliverSet.vue 0 → 100644
<template>
<div class="mall-section-container">
<div class="mall-content-section">
<div class="mall-content-title">
<el-breadcrumb separator="/">
<el-breadcrumb-item :to="{ path: '' }"><a href="/report/#/memberSummary">首页</a></el-breadcrumb-item>
<el-breadcrumb-item>设置</el-breadcrumb-item>
<el-breadcrumb-item>配送设置</el-breadcrumb-item>
</el-breadcrumb>
<h3>
<span>配送设置</span>
</h3>
</div>
<div class="section">
<div class="header-top">
<span>门店自提</span>
<el-switch v-model="pickStatus" @change="changeStatus"> </el-switch>
</div>
<div v-show="pickStatus">
<div class="operate-top">
<div class="fl">
<div class="search-item">
<el-input v-model="searchValue" placeholder="请输入自提点名称进行搜索" prefix-icon="el-icon-search" clearable class="w-280" @keyup.enter.native="getSearchList" @clear="getSearchList"> </el-input>
</div>
</div>
<div class="fr">
<el-button plain @click="setPicked">自提设置</el-button>
<el-button type="primary" @click="addStore('-1')">新增优惠券</el-button>
</div>
</div>
<el-table ref="multipleTable" :data="tableDate" style="width: 100%" v-loading="loading" @selection-change="handleSelectAll">
<el-table-column type="selection" width="55"> </el-table-column>
<el-table-column prop="pickUpPointName" label="自提点名称" min-width="200px"> </el-table-column>
<el-table-column prop="pickUpPointAddress" label="自提点地址" min-width="200px"> </el-table-column>
<el-table-column prop="pickUpPointPhone" label="联系电话"> </el-table-column>
<el-table-column prop="canChooseTime" label="自提时间可选">
<template slot-scope="scope">
<span>{{ scope.row.canChooseTime === 1 ? '是' : '否' }}</span>
</template>
</el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<div>
<el-button type="text" @click="goAdd(scope.row)">编辑</el-button>
<el-popover placement="top" width="160" v-model="scope.row.visible2" style="margin-left:8px">
<p style="line-height:1.5;padding: 10px 10px 20px;">确定删除该自提点吗？</p>
<div style="text-align: right; margin: 0">
<el-button size="mini" type="text" @click="scope.row.visible2 = false">取消</el-button>
<el-button type="primary" size="mini" @click="deletePoint(scope.row)">确定</el-button>
</div>
<el-button slot="reference" type="text">删除</el-button>
</el-popover>
</div>
</template>
</el-table-column>
<template slot="empty">
<div class="no-data-wrap">
<div class="no-data-icon">
<img src="../../../static/img/no-data_icon.png" />
</div>
<p>暂无数据</p>
</div>
</template>
</el-table>
<div class="pagination-conteiner" v-show="tableDate.length > 0">
<div class="pagination">
<el-pagination v-if="total != 0" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="pageSizes" :page-size="pageSize" layout="total, sizes, prev, pager, next" :total="total"> </el-pagination>
</div>
</div>
</div>
</div>
</div>
<!-- 自提点设置 -->
<pickedAuto :pickedForm="pickedForm"></pickedAuto>
</div>
</template>
<script>
import qs from 'qs';
import request from '../../service/request.js';
// import getInputVal from '../../../utils/common.js';
// import stockModal from '../../../components/getSkuList';
import pickedAuto from './pickedAuto';
export default {
data() {
return {
searchValue: '',
currentPage: 1,
pageSizes: [20, 30, 50],
pageSize: 20,
total: 2,
pickStatus: true, //自提状态
loading: false,
selectList: [], //复选框选中的数据
tableDate: [],
pickedForm: {
dialogVisible: false,
selectIdList: [] //复选框选中的数据的id
}
};
},
created() {
this.getStatus();
},
methods: {
getSearchList() {
this.currentPage = 1;
this.getList();
},
//分页设置每页的数量
handleSizeChange(size) {
this.pageSize = size;
this.getList();
},
// 分页设置跳转到第几页
handleCurrentChange(page) {
this.currentPage = page;
this.getList();
},
//复选
handleSelectAll(val) {
this.selectList = val;
},
// 自提设置
setPicked() {
if (this.selectList.length < 1) {
this.$message.error('请先选择自提点');
return false;
} else {
this.pickedForm.selectIdList = [];
for (let item of this.selectList) {
this.pickedForm.selectIdList.push(item.integralMallPickUpPointId);
}
this.pickedForm.dialogVisible = true;
}
},
//获取自提点状态
getStatus() {
request.get('/api-integral-mall/pick-up-point-switch-status').then(res => {
if (res.data.errorCode === 0) {
if (res.data.result.status === 0) {
this.pickStatus = false;
} else if (res.data.result.status === 1) {
this.pickStatus = true;
}
this.getList();
} else {
this.$message.error(res.data.message);
}
});
},
// 修改自提点状态
changeStatus() {
let params = {
status: this.pickStatus ? 1 : 0
};
request.get('/api-integral-mall/set-pick-up-point-switch-status', { params }).then(res => {
if (res.data.errorCode === 0) {
this.$message.success('设置成功');
this.getList();
} else {
this.$message.error(res.data.message);
}
});
},
//删除自提点
deletePoint(item) {
let params = {
integralMallPickUpPointId: item.integralMallPickUpPointId
};
request.get('/api-integral-mall/delete-pick-up-point', { params }).then(res => {
if (res.data.errorCode === 0) {
this.getList();
} else {
this.$message.error(res.data.message);
}
});
},
getList() {
let params = {
currentPage: this.currentPage,
pageSize: this.pageSize,
search: this.searchValue
};
this.loading = true;
request.post('/api-integral-mall/page-pick-up-points', qs.stringify(params)).then(res => {
if (res.data.errorCode === 0) {
if (res.data.result.result) {
this.tableDate = res.data.result.result;
this.total = res.data.result.totalCount;
} else {
this.tableDate = [];
this.total = 0;
}
this.loading = false;
} else {
this.$message.error(res.data.message);
this.loading = false;
}
});
},
// 新增
addStore() {
this.$router.push({ name: 'editDeliver', query: { integralMallPickUpPointId: '-1' } });
},
// 编辑
goAdd(item) {
this.$router.push({ name: 'editDeliver', query: { integralMallPickUpPointId: item.integralMallPickUpPointId } });
}
},
components: {
pickedAuto
}
};
</script>
<style scoped>
.section {
background: #fff;
margin: 24px;
padding: 24px;
}
.header-top {
margin: 15px 0 22px 0;
}
.header-top span {
width: 80px;
display: inline-block;
}
</style>
static/css/iconfont.css
......@@ -40,10 +40,6 @@
content: "\e635";
}
.icon-tupian:before {
content: "\e616";
}
.icon-lipin:before {
content: "\e78a";
}
......@@ -56,6 +52,10 @@
content: "\e615";
}
.icon-shezhi:before {
content: "\e663";
}
.icon-xinxixianshi:before {
content: "\e74f";
}
......
static/fonts/iconfont.svg
......@@ -38,9 +38,6 @@ Created by iconfont
<glyph glyph-name="shangpin" unicode="&#58933;" d="M891.303669 896h-759.406713C59.153786 896 0 836.846214 0 764.103044v-760.206088c0-72.743169 59.153786-131.896956 131.896956-131.896956h760.206088c72.743169 0 131.896956 59.153786 131.896956 131.896956V764.103044C1023.200625 836.846214 964.046838 896 891.303669 896zM73.542545 647.394223c18.385636-9.592506 38.370023-14.388759 58.354411-14.388759h760.206088c19.984387 0 39.968774 4.796253 58.354411 14.388759v-642.697892c0-31.97502-26.379391-58.354411-58.354411-58.354411H131.896956c-31.97502 0-58.354411 26.379391-58.354411 58.354411V647.394223z m817.761124 58.354411h-759.406713c-31.97502 0-58.354411 26.379391-58.354411 58.35441s26.379391 58.354411 58.354411 58.354411h760.206088c31.97502 0 58.354411-26.379391 58.354411-58.354411-0.799375-31.97502-26.379391-58.354411-59.153786-58.35441zM224.624512 367.612802c19.185012-143.887588 141.489461-251.803279 286.9758-251.803278s268.590164 107.915691 286.9758 251.803278c21.583138 11.990632 34.373146 34.373146 34.373146 59.153787 0 37.570648-30.376269 67.946916-67.946916 67.946916s-67.946916-30.376269-67.946917-67.946916c0-21.583138 10.391881-42.366901 27.978143-55.156909C708.246682 266.891491 617.117877 188.552693 511.600312 188.552693s-196.64637 78.338798-213.433255 183.056987c17.586261 12.790008 27.978142 33.57377 27.978142 55.156909 0 37.570648-30.376269 67.946916-67.946916 67.946916s-67.946916-30.376269-67.946917-67.946916c0-24.78064 12.790008-47.163154 34.373146-59.153787z" horiz-adv-x="1024" />
<glyph glyph-name="tupian" unicode="&#58902;" d="M324.3 358.9c-57.9 0-105 47.1-105 105s47.1 105 105 105 105-47.1 105-105-47.1-105-105-105z m0 168c-34.7 0-63-28.3-63-63s28.3-63 63-63 63 28.3 63 63-28.3 63-63 63zM560.1-5.5c-5.4 0-10.7 2.1-14.8 6.2L344.9 201c-10.2 10.2-26.9 10.2-37.1 0L163.1 56.3c-8.2-8.2-21.5-8.2-29.7 0s-8.2 21.5 0 29.7l144.7 144.7c26.6 26.6 69.9 26.6 96.5 0L575 30.3c8.2-8.2 8.2-21.5 0-29.7-4.1-4.1-9.5-6.1-14.9-6.1zM414 150.3c-5.4 0-10.7 2.1-14.8 6.2-8.2 8.2-8.2 21.5 0 29.7l248.3 248.3c31 31 81.5 31 112.4 0l144.3-144.3c8.2-8.2 8.2-21.5 0-29.7s-21.5-8.2-29.7 0L730.2 404.7c-14.6 14.6-38.4 14.6-53.1 0L428.9 156.5c-4.1-4.1-9.5-6.2-14.9-6.2zM806-15H218c-57.9 0-105 47.1-105 105V678c0 57.9 47.1 105 105 105h588c57.9 0 105-47.1 105-105v-588c0-57.9-47.1-105-105-105zM218 741c-34.7 0-63-28.3-63-63v-588c0-34.7 28.3-63 63-63h588c34.7 0 63 28.3 63 63V678c0 34.7-28.3 63-63 63H218z" horiz-adv-x="1024" />
<glyph glyph-name="lipin" unicode="&#59274;" d="M867.54211 618.19181h-51.287083l8.377808 12.262278c12.262278 18.388812 24.520463 49.04195 18.388812 73.56139 0 24.51637-18.388812 49.036833-36.779671 61.301157-30.652114 18.388812-61.299111 18.388812-98.083899 12.257162-73.558319-18.389836-147.120732-79.68997-190.030008-140.989081l-6.132674-6.131651-6.126534 6.131651C462.959585 697.88485 389.398196 759.184985 315.83476 777.57482c-36.779671 12.262278-67.431785 6.130627-98.078783-12.257161-24.520463-12.264325-36.779671-36.783765-36.779671-61.301158 0-24.520463 6.126534-49.04195 18.388812-73.56139l6.636141-12.262278h-49.546439c-42.909276 0-73.562413-30.648021-73.562413-73.558319v-125.059274c0-30.652114 24.520463-61.299111 55.168484-67.430762V23.60793c0-42.909276 30.652114-73.561389 73.563436-73.56139h300.371068v-0.005116h300.377208c42.911322 0 73.558319 30.652114 73.55832 73.562413V315.35355c0 12.259208-0.402159 36.783765-0.40216 36.783765h6.533811c24.520463 6.131651 49.04195 36.779671 49.041949 67.430762V544.63349c0.001023 42.910299-30.652114 73.558319-73.562413 73.55832zM247.995699 724.858178c20.23281 15.017018 38.60832 9.81146 61.918211 3.979638C359.030561 711.687204 393.106658 678.658973 438.500521 638.114558l22.415522-21.559015H268.729929c-17.483186 23.312962-35.890418 47.548946-35.890418 76.689637-0.001023 17.483186 3.501754 19.956517 15.156188 31.612998zM136.968 441.401338v91.212398c0 17.655102 17.649985 35.305087 35.305087 35.305087h313.856197v-161.823596H172.273087c-23.539112 0-35.305087 17.649985-35.305087 35.306111zM486.92337 1.532145H220.53937c-22.733771 0-34.099632 11.368932-34.099632 34.102703V318.042799c0 17.052374 17.052374 34.104749 34.104749 34.104749H486.92337v-350.615403z m93.225241 631.372761c34.651194 34.640961 82.243119 71.724555 138.027634 94.402044 23.090904 5.77247 36.166711 4.90573 59.463299-6.126534 10.420327-9.81146 14.090926-15.172561 14.090927-32.489972 0-23.096021-22.522969-54.402027-39.842427-71.725578H565.537845l14.610766 15.94004z m257.409605-597.270058c0-17.052374-17.051351-34.102702-34.102703-34.102703h-261.4752v350.615403h261.4752c17.056468 0 34.102702-17.056468 34.102703-34.104749v-282.407951z m47.049572 405.030733c0-17.897625-17.897625-35.800367-35.795251-35.800368H540.282648V569.14986h308.529889c17.892509 0 35.795251-17.902742 35.795251-35.802414v-92.681865z" horiz-adv-x="1024" />
......@@ -50,6 +47,9 @@ Created by iconfont
<glyph glyph-name="daifahuo" unicode="&#58901;" d="M329.318 324.833c15.114 0 27.361 12.268 27.361 27.341V502.149c0 15.114-12.247 27.361-27.361 27.361s-27.341-12.247-27.341-27.361v-122.593h-117.74c-15.135 0-27.361-12.268-27.361-27.382 0-15.073 12.227-27.341 27.361-27.341h145.08zM721.244 214.835c-73.605 0-134.717-54.415-145.285-125.092H448.983c-10.547 70.676-71.66 125.092-145.244 125.092-80.978 0-146.862-65.884-146.862-146.883 0-80.957 65.884-146.862 146.862-146.862 69.652 0 128.143 48.742 143.135 113.91h131.195c14.991-65.188 73.523-113.91 143.155-113.91 80.957 0 146.842 65.905 146.842 146.862 0.02 80.998-65.864 146.883-146.821 146.883zM303.739-24.207c-50.811 0-92.16 41.37-92.16 92.16s41.349 92.16 92.16 92.16 92.16-41.37 92.16-92.16-41.349-92.16-92.16-92.16z m417.505 0c-50.811 0-92.14 41.37-92.14 92.16s41.329 92.16 92.14 92.16c50.77 0 92.14-41.37 92.14-92.16s-41.37-92.16-92.14-92.16zM1003.418 751.186c-2.191 29.635-14.029 54.129-34.243 70.82-33.26 27.464-77.578 25.395-88.023 24.453l-485.028-0.819c-38.953 0-60.908-15.626-72.458-28.754-23.04-26.132-21.914-59.802-21.094-69.12v-93.614l-222.72-117.76c-51.589-22.303-58.88-87.06-59.167-89.825a26.218 26.218 0 0 1-0.143-2.826l-0.061-375.849c0-15.114 12.247-27.341 27.341-27.341 15.114 0 27.361 12.227 27.361 27.32l0.061 373.965c1.004 6.144 6.84 36.311 26.808 44.564a24.372 24.372 0 0 1 2.335 1.085l238.305 125.993a27.361 27.361 0 0 1 14.561 24.207V749.158c0 1.311 0 2.089-0.184 3.359-0.492 5.12-0.041 19.702 7.782 28.426 6.001 6.636 16.486 9.994 31.293 9.994h0.061l486.339 0.819c1.044 0 2.109 0.041 3.133 0.184 0.266 0.02 30.597 2.785 48.62-12.104 8.479-7.004 13.23-17.388 14.479-31.724v-680.12c0-15.094 12.227-27.341 27.341-27.341s27.402 12.206 27.402 27.3V749.157a33.572 33.572 0 0 1-0.102 2.028z" horiz-adv-x="1024" />
<glyph glyph-name="shezhi" unicode="&#58979;" d="M245.921684 33.684211a107.789474 107.789474 0 0 0 208.788211 0H916.210526a26.947368 26.947368 0 1 0 0-53.894737H454.709895a107.789474 107.789474 0 0 0-208.788211 0H107.789474a26.947368 26.947368 0 1 0 0 53.894737h138.13221z m377.263158 377.263157a107.789474 107.789474 0 0 0 208.788211 0H916.210526a26.947368 26.947368 0 1 0 0-53.894736h-84.237473a107.789474 107.789474 0 0 0-208.788211 0H107.789474a26.947368 26.947368 0 1 0 0 53.894736h515.395368z m-377.263158 377.263158a107.789474 107.789474 0 0 0 208.788211 0H916.210526a26.947368 26.947368 0 1 0 0-53.894737H454.709895a107.789474 107.789474 0 0 0-208.788211 0H107.789474a26.947368 26.947368 0 0 0 0 53.894737h138.13221zM350.315789 707.368421a53.894737 53.894737 0 1 1 0 107.789474 53.894737 53.894737 0 0 1 0-107.789474z m377.263158-377.263158a53.894737 53.894737 0 1 1 0 107.789474 53.894737 53.894737 0 0 1 0-107.789474z m-377.263158-377.263158a53.894737 53.894737 0 1 1 0 107.789474 53.894737 53.894737 0 0 1 0-107.789474z" horiz-adv-x="1024" />
<glyph glyph-name="xinxixianshi" unicode="&#59215;" d="M486.4 477.696h68.096V128H486.4V477.696zM512-42.496c239.104 0 426.496 187.904 426.496 426.496S751.104 810.496 512 810.496 85.504 623.104 85.504 384s187.392-426.496 426.496-426.496z m0-85.504C230.4-128 0 102.4 0 384S230.4 896 512 896s512-230.4 512-512-230.4-512-512-512zM520.704 568.32m-51.2 0a51.2 51.2 0 1 1 102.4 0 51.2 51.2 0 1 1-102.4 0Z" horiz-adv-x="1024" />
......
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