Skip to content

I
integral-mall
Commit 5841645c by damodmg
Options

更新新功能

parent e227e7c3
Showing with 34 additions and 15 deletions
dist/index.html
......@@ -2,4 +2,4 @@
gio('init','8be12240a3749eab', {});
//custom page code begin here
//custom page code end here
gio('send');</script><link href=./static/css/app.146a8776c3e66a280c06b2e1ee229e2e.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.35.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.3c5834cc437c7b2d524e.js></script><script type=text/javascript src=./static/js/app.fef8ff300d79810e2c62.js></script></body></html>
\ No newline at end of file
gio('send');</script><link href=./static/css/app.aa4551687ed7173f3d427e019e6ca57f.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.35.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.18.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.9072594f61a88f768c70.js></script><script type=text/javascript src=./static/js/app.55cdee07adf736786679.js></script></body></html>
\ No newline at end of file
dist/static/css/app.146a8776c3e66a280c06b2e1ee229e2e.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.aa4551687ed7173f3d427e019e6ca57f.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.55cdee07adf736786679.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.fef8ff300d79810e2c62.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.3c5834cc437c7b2d524e.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.9072594f61a88f768c70.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
index.html
......@@ -30,12 +30,13 @@
<script src="//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.12.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js"></script>
<script src='//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.js'></script>
<script src="//web-1251519181.file.myqcloud.com/components/store-new.2.0.11.js"></script>
<!-- <script src="//web-1251519181.file.myqcloud.com/components/store-new.2.0.11.js"></script> -->
<!-- <script src="//web-1251519181.file.myqcloud.com/components/member-info.1.0.01.js"></script> -->
<script src="//web-1251519181.file.myqcloud.com/components/card.2.0.06.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/people.2.0.26.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/store-card.2.0.18.js"></script>
<!-- <script src="//web-1251519181.cos.ap-shanghai.myqcloud.com/components/space.2.0.00.js"></script> -->
<!-- built files will be auto injected -->
</body>
......
src/views/goods/coupon/coupon.vue
......@@ -59,6 +59,7 @@
<div class="info-name">
<p class="pro-ellipsis">{{ scope.row.proTitle }}</p>
<p class="category-ellipsis">{{ scope.row.proSubTitle }}</p>
<p class="category-ellipsis">{{ scope.row.remarks }}</p>
</div>
</div>
</template>
......
src/views/goods/gift/gift.vue
......@@ -185,11 +185,7 @@ export default {
showSelfStatus: false,
showFlag: false,
openFlag: false,
tableDate: [
{
giftName: '1111'
}
],
tableDate: [],
currentPage: 1,
pageSizes: [20, 40, 60, 80],
pageSize: 20,
......
src/views/order/couponExchange.vue
......@@ -72,7 +72,7 @@
<img v-if="scope.row.cardType === 1 && !scope.row.giftMainPic" src="../../../static/img/quan03.png" alt="" />
<div class="info-name">
<p class="pro-ellipsis">{{ scope.row.giftName }}</p>
<p style="font-size:13px;color:#909399" v-if="scope.row.proReferId.indexOf(',') === -1"><span v-if="scope.row.status === 2">已领取</span><span v-if="scope.row.status <= 1">未领取</span> / <span v-if="scope.row.useStatus === 5">已使用</span><span v-if="scope.row.useStatus === 0">未使用</span></p>
<p style="font-size:13px;color:#909399" v-if="scope.row.proReferId.indexOf(',') === -1"><span v-if="scope.row.status === 2">已领取</span><span v-if="scope.row.status <= 1">未领取</span> / <span v-if="scope.row.useStatus === 5">已使用</span><span v-if="scope.row.useStatus === 0">未使用</span><span v-if="scope.row.useStatus === 7">已销毁</span></p>
</div>
</div>
</template>
......
src/views/setting/convenSet.vue
......@@ -13,12 +13,15 @@
</h3>
</div>
<div class="section">
<el-form :model="form" ref="form" :rules="formRules" label-width="100px" class="demo-ruleForm" label-position="right">
<el-form-item prop="cardType" label="积分消耗卡">
<el-form :model="form" ref="form" :rules="formRules" label-width="150px" class="demo-ruleForm" label-position="right">
<!-- <el-form-item prop="cardType" label="积分消耗卡">
<el-select v-model="form.cardType" placeholder="积分消耗卡">
<el-option label="集团卡" :value="2"></el-option>
<el-option label="品牌卡" :value="1"></el-option>
</el-select>
</el-form-item> -->
<el-form-item prop="openAutoShelf" label="礼品无库存自动下架">
<el-switch v-model="form.openAutoShelf"></el-switch>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="handleSubmit('form')">确定</el-button>
......@@ -38,10 +41,12 @@ export default {
data() {
return {
form: {
cardType: ''
cardType: '',
openAutoShelf: false
},
formRules: {
cardType: [{ required: true, message: '请选择积分消耗卡', trigger: 'change' }]
cardType: [{ required: true, message: '请选择积分消耗卡', trigger: 'change' }],
openAutoShelf: [{ required: true, message: '请设置无库存自动下架', trigger: 'change' }]
}
};
},
......@@ -53,6 +58,7 @@ export default {
request.get('/api-integral-mall/get-card-config').then(res => {
if (res.data.errorCode === 0) {
this.form.cardType = res.data.result.cardType || '';
this.form.openAutoShelf = res.data.result.openAutoShelf === 1 ? true : false;
} else {
this.$message.error(res.data.message);
}
......@@ -62,10 +68,12 @@ export default {
this.$refs[form].validate(valid => {
if (valid) {
let params = {
cardType: this.form.cardType
// cardType: this.form.cardType,
openAutoShelf: this.form.openAutoShelf ? 1 : 0
};
request.get('/api-integral-mall/save-card-config', { params }).then(res => {
if (res.data.errorCode === 0) {
this.$message.success('保存成功');
this.getMess();
} else {
this.$message.error(res.data.message);
......
src/views/setting/deliverSet.vue
......@@ -37,6 +37,7 @@
</div>
</div>
<div class="fr">
<el-button plain @click="exportData"><i class="iconfont icon-icon_yunxiazai" style="margin-right:5px"></i>导出自提点</el-button>
<el-button plain @click="setPicked">自提设置</el-button>
<el-button type="primary" @click="addStore('-1')">新增自提点</el-button>
</div>
......@@ -85,6 +86,8 @@
</div>
<!-- 自提点设置 -->
<pickedAuto :pickedForm="pickedForm" @getList="getList"></pickedAuto>
<!-- 导出自提点 -->
<vue-gic-export-excel :dataArr="tableDate" :dialogVisible.sync="dialogVisible" :type="2" :excelUrl="excelUrl" :params="params" :projectName="projectName"></vue-gic-export-excel>
</div>
</template>
......@@ -113,7 +116,12 @@ export default {
selectIdList: [], //复选框选中的数据的id
list: [{ timeRange: [] }] //初始数据
},
enableAccessControl: false
enableAccessControl: false,
// 导出
dialogVisible: false,
excelUrl: '/api-integral-mall/pick-up-points-excel',
params: { search: '', dataType: 2 },
projectName: 'integral-mall'
};
},
created() {
......@@ -285,6 +293,11 @@ export default {
// 编辑
goAdd(item) {
this.$router.push({ name: 'editDeliver', query: { integralMallPickUpPointId: item.integralMallPickUpPointId } });
},
// 导出数据
exportData() {
this.dialogVisible = true;
this.params.search = this.searchValue;
}
},
components: {
......
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