Skip to content

I
integral-mall
Commit 531b6921 by liuchenxi
Options

Merge branch 'feature/11月迭代' into dev 

# Conflicts:
#	package-lock.json
parents 45db741d 4fe21850
Showing with 92 additions and 36 deletions
package-lock.json
......@@ -11460,7 +11460,7 @@
},
"sortablejs": {
"version": "1.10.2",
"resolved": "https://registry.nlark.com/sortablejs/download/sortablejs-1.10.2.tgz?cache=0&sync_timestamp=1625423971526&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsortablejs%2Fdownload%2Fsortablejs-1.10.2.tgz",
"resolved": "https://registry.nlark.com/sortablejs/download/sortablejs-1.10.2.tgz",
"integrity": "sha1-bkA2TZE/mLhaFPZnj5K1wSIfUpA="
},
"source-list-map": {
......
src/views/goods/coupon/coupon.vue
......@@ -18,12 +18,13 @@
<div class="operate-top">
<div class="fl">
<div class="search-item m-r-10">
<el-input v-model.trim="searchValue" placeholder="请输入优惠券名称进行搜索" prefix-icon="el-icon-search" clearable class="w-280" @keyup.enter.native="getSearchList" @clear="getSearchList"></el-input>
<el-input v-model.trim="searchValue" placeholder="请输入优惠券名称/创建人进行搜索" prefix-icon="el-icon-search" clearable class="w-300" @keyup.enter.native="getSearchList" @clear="getSearchList"></el-input>
</div>
<div class="search-item m-r-10">
<el-select v-model="shelf" placeholder="上下架状态" clearable class="w-140" @change="getListCurr">
<el-option label="已上架" :value="2"></el-option>
<el-option label="已下架" :value="1"></el-option>
<el-option label="待上架" :value="3"></el-option>
</el-select>
</div>
<div class="search-item m-r-10">
......@@ -137,6 +138,9 @@
<span style="display:none">{{ refash }}</span>
</template>
</el-table-column>
<el-table-column fixed="right" prop="shelf " label="状态" min-width="110px">
<template slot-scope="scope">{{ scope.row.shelf ? (scope.row.shelf == 1 ? '已下架' : scope.row.shelf == 2 ? '已上架' : '待上架') : '--' }}</template>
</el-table-column>
<el-table-column fixed="right" label="操作" min-width="180px">
<template slot-scope="scope">
<div>
......@@ -675,8 +679,8 @@ export default {
.m-r-10 {
margin-right: 10px;
}
.w-280 {
width: 280px;
.w-300 {
width: 300px;
}
.w-140 {
width: 140px;
......
src/views/goods/gift/gift.vue
......@@ -21,12 +21,13 @@
<div class="search-wrap" style="display: flex;justify-content: space-between;margin-bottom: 20px;">
<div class="left" style="display: flex;gap:10px;flex-wrap: wrap;">
<div class="search-content-item" style="height:32px;">
<el-input v-model="searchValue" placeholder="请输入礼品名称/编码进行搜索" prefix-icon="el-icon-search" clearable class="w-280" @keyup.enter.native="getSearchList" @clear="getSearchList"></el-input>
<el-input v-model="searchValue" placeholder="请输入礼品名称/编码/创建人进行搜索" prefix-icon="el-icon-search" clearable class="w-300" @keyup.enter.native="getSearchList" @clear="getSearchList"></el-input>
</div>
<div class="search-content-item" style="height:32px;">
<el-select v-model="shelf" placeholder="上下架状态" clearable class="w-140" @change="getListCurr">
<el-option label="已上架" :value="2"></el-option>
<el-option label="已下架" :value="1"></el-option>
<el-option label="待上架" :value="3"></el-option>
</el-select>
</div>
<div class="search-content-item" style="height:32px;">
......@@ -147,6 +148,9 @@
<span style="display:none">{{ refash }}</span>
</template>
</el-table-column>
<el-table-column fixed="right" prop="shelf " label="状态" min-width="110px">
<template slot-scope="scope">{{ scope.row.shelf ? (scope.row.shelf == 1 ? '已下架' : scope.row.shelf == 2 ? '已上架' : '待上架') : '--' }}</template>
</el-table-column>
<el-table-column fixed="right" label="操作" min-width="220px">
<template slot-scope="scope">
<div>
......@@ -834,8 +838,8 @@ export default {
margin: 24px;
padding: 24px;
}
.w-280 {
width: 280px;
.w-300 {
width: 300px;
}
.w-140 {
width: 140px;
......
src/views/order/couponExchange.vue
......@@ -111,7 +111,18 @@
<memberInfo :memberObj="scope.row" :requestProject="requestProject" :placement="placement"></memberInfo>
</template>
</el-table-column>
<el-table-column prop="complete" label="交易状态" min-width="170px">
<el-table-column prop="memberCardStatus" label="会员状态" min-width="120px">
<template slot-scope="{ row }">
<span>{{ row.memberCardStatus == 1 ? '正常' : row.memberCardStatus == 2 ? '冻结' : '--' }}</span>
</template>
</el-table-column>
<el-table-column fixed="right" prop="saleNum" label="实付金额" min-width="120px">
<template slot-scope="scope">
<p style="line-height:18px">积分：{{ scope.row.unitCostIntegral }}</p>
<p style="line-height:18px">现金：￥{{ scope.row.payCost }}</p>
</template>
</el-table-column>
<el-table-column fixed="right" prop="complete" label="交易状态" min-width="170px">
<template slot-scope="scope">
<p style="line-height:18px">
<span v-if="scope.row.status <= 0">交易关闭</span>
......@@ -123,13 +134,6 @@
</p>
</template>
</el-table-column>
<el-table-column fixed="right" prop="saleNum" label="实付金额" min-width="120px">
<template slot-scope="scope">
<p style="line-height:18px">积分：{{ scope.row.unitCostIntegral }}</p>
<p style="line-height:18px">现金：￥{{ scope.row.payCost }}</p>
</template>
</el-table-column>
<template slot="empty">
<div class="no-data-wrap">
<div class="no-data-icon">
......
src/views/order/giftExchange.vue
......@@ -120,6 +120,11 @@
</p> -->
</template>
</el-table-column>
<el-table-column prop="memberCardStatus" label="会员状态" min-width="120px">
<template slot-scope="{ row }">
<span>{{ row.memberCardStatus == 1 ? '正常' : row.memberCardStatus == 2 ? '冻结' : '--' }}</span>
</template>
</el-table-column>
<el-table-column prop="refundStatus" label="售后" min-width="120px">
<template slot-scope="scope">
<p style="line-height:18px" v-if="scope.row.refundStatusNowLog === 0">退款中</p>
......@@ -133,7 +138,13 @@
</template>
</el-table-column>
<el-table-column prop="creatorName" label="礼品创建人" min-width="120px"></el-table-column>
<el-table-column prop="complete" label="交易状态" min-width="170px">
<el-table-column fixed="right" prop="saleNum" label="实付金额" min-width="120px">
<template slot-scope="scope">
<p style="line-height:18px">积分：{{ scope.row.unitCostIntegral }}</p>
<p style="line-height:18px">现金：￥{{ scope.row.payCost }}</p>
</template>
</el-table-column>
<el-table-column fixed="right" prop="complete" label="交易状态" min-width="170px">
<template slot-scope="scope">
<p style="line-height:18px">
<span v-if="scope.row.status === 11">待付款</span>
......@@ -156,13 +167,6 @@
</p>
</template>
</el-table-column>
<el-table-column fixed="right" prop="saleNum" label="实付金额" min-width="120px">
<template slot-scope="scope">
<p style="line-height:18px">积分：{{ scope.row.unitCostIntegral }}</p>
<p style="line-height:18px">现金：￥{{ scope.row.payCost }}</p>
</template>
</el-table-column>
<template slot="empty">
<div class="no-data-wrap">
<div class="no-data-icon">
......
src/views/setting/convenSet.vue
......@@ -22,30 +22,49 @@
</el-form-item> -->
<h2 class="icon-type-title">
<div class="mark"></div>
礼品设置
商品设置
</h2>
<el-form-item prop="openAutoShelf" label="礼品无库存自动下架">
<el-form-item prop="openAutoShelf" label="无库存自动下架">
<el-switch v-model="form.openAutoShelf"></el-switch>
</el-form-item>
<el-form-item prop="showStoreType" label="礼品展示门店类型">
<el-form-item prop="showStoreType" label="展示门店类型">
<el-checkbox-group v-model="form.showStoreType">
<el-checkbox label="1">服务门店</el-checkbox>
<el-checkbox label="2">协管门店</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item prop="openAutoShelf" label="库存提示文案展示">
<!-- <el-radio-group v-model="form.stockShow">
<el-radio :label="0">不展示</el-radio>
<el-radio :label="1">展示</el-radio>
</el-radio-group> -->
<el-checkbox style="vertical-align: top;margin-right: 10px" v-model="form.stockShow" :true-label="1" :false-label="0"></el-checkbox><span class="stock_tip">展示</span>
<div v-show="form.stockShow" class="stock_tip">库存少于 <el-input-number v-model="form.stockShowAmount" class="stock_tip_ipt" controls-position="right" :min="1" />件，展示为【即将兑光】</div>
<div class="layout--tips">
开启后，库存提示文案将在积分商城商品列表页展示。
<el-popover placement="right" width="400" trigger="hover">
<img src="../../../static/img/tip.png" />
<el-button slot="reference" type="text">查看示例</el-button>
</el-popover>
</div>
</el-form-item>
<h2 class="icon-type-title" style="margin-top:40px">
<div class="mark"></div>
订单设置
</h2>
<el-form-item prop="autoConfirmReceipt" label="自动确认收货">
<el-form-item prop="autoConfirmReceipt" label="发货后自动确认收货">
<el-switch v-model="form.autoConfirmReceipt" :active-value="1" :inactive-value="0" @change="form.autoConfirmReceiptDay = null"> </el-switch>
</el-form-item>
<el-form-item prop="autoConfirmReceiptDay" v-if="form.autoConfirmReceipt === 1" :rules="[{ required: true, message: '请选择自动收货天数' }]">
<el-select v-model="form.autoConfirmReceiptDay" placeholder="请选择自动收货天数">
<el-option label="7天后" :value="7"> </el-option>
<el-option label="15天后" :value="15"> </el-option>
<el-option label="30天后" :value="30"> </el-option>
</el-select>
<el-form-item prop="autoConfirmReceiptDay" v-if="form.autoConfirmReceipt === 1" :rules="[{ required: true, message: '请选择自动收货天数' }]" label="自动确认收货时间">
<div class="stock_tip">
发货后
<el-select v-model="form.autoConfirmReceiptDay" placeholder="请选择" style="width: 115px;margin: 0 10px">
<el-option label="7" :value="7"> </el-option>
<el-option label="15" :value="15"> </el-option>
<el-option label="30" :value="30"> </el-option>
</el-select>
天，自动确认收货
</div>
</el-form-item>
<div class="confim-btn" :style="{ width: fixedWidth + 'px' }">
<el-form-item class="fix-btn">
......@@ -71,7 +90,9 @@ export default {
openAutoShelf: false,
showStoreType: [],
autoConfirmReceipt: 0,
autoConfirmReceiptDay: null
autoConfirmReceiptDay: null,
stockShow: 0,
stockShowAmount: undefined
},
formRules: {
cardType: [{ required: true, message: '请选择积分消耗卡', trigger: 'change' }],
......@@ -94,12 +115,15 @@ export default {
this.form.autoConfirmReceiptDay = res.data.result.autoConfirmReceiptDay || null;
this.form.openAutoShelf = res.data.result.openAutoShelf === 1 ? true : false;
this.form.showStoreType = res.data.result.showStoreType ? res.data.result.showStoreType.split(',') : [];
this.form.stockShow = res.data.result.stockShow || 0;
this.form.stockShowAmount = res.data.result.stockShowAmount || undefined;
} else {
this.$message.error(res.data.message);
}
});
},
handleSubmit(form) {
if (!this.form.stockShowAmount) return this.$message.warning('请输入库存提示文案数量限制');
this.$refs[form].validate(valid => {
console.log(valid);
if (valid) {
......@@ -107,7 +131,9 @@ export default {
// cardType: this.form.cardType,
autoConfirmReceipt: this.form.autoConfirmReceipt,
openAutoShelf: this.form.openAutoShelf ? 1 : 0,
showStoreType: this.form.showStoreType.join(',')
showStoreType: this.form.showStoreType.join(','),
stockShow: this.form.stockShow,
stockShowAmount: this.form.stockShow ? this.form.stockShowAmount : null
};
if (params.autoConfirmReceipt === 1) params.autoConfirmReceiptDay = this.form.autoConfirmReceiptDay;
this.btnLoading = true;
......@@ -129,7 +155,7 @@ export default {
components: {}
};
</script>
<style scoped>
<style scoped lang="less">
.section {
background: #fff;
margin: 24px;
......@@ -143,6 +169,8 @@ export default {
font-size: 16px;
font-weight: 700;
margin-bottom: 20px;
padding: 10px;
background: #f7f8fa;
}
.icon-type-title .mark {
width: 3px;
......@@ -164,4 +192,16 @@ export default {
.fix-btn {
margin-left: -100px;
}
.stock_tip {
color: #303133;
.stock_tip_ipt {
margin: 0 10px;
width: 115px;
}
}
.layout--tips {
margin-top: 10px;
font-size: 12px;
color: #909399;
}
</style>
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