Skip to content

I
integral-mall
Commit f337443f by huaying
Options

Merge branch 'feature/巴拉积分购' into dev 

# Conflicts:
#	dist/index.html
#	dist/js/main.566ccbecad82e7617bcb.js
#	dist/js/main.566ccbecad82e7617bcb.js.LICENSE.txt
#	dist/js/main.a55a5d978dc349a8d8aa.js
#	dist/js/main.a55a5d978dc349a8d8aa.js.LICENSE.txt
#	dist/js/main.ecbbbfb1f159e0c36d30.js
#	dist/js/main.ecbbbfb1f159e0c36d30.js.LICENSE.txt
parents e8b931a0 60ff584e
Showing with 257 additions and 27 deletions
dist/css/main.837a11199f0b9096415d.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/index.html
<<<<<<< HEAD
<!doctype html><html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="stylesheet" href="./static/css/iconfont.css"><link rel="stylesheet" href="./static/css/common.css"><link rel="shortcut icon" type="image/x-icon" href="./static/img/favicon.ico"><title></title><script defer="defer" src="/integral-mall/js/main.ecbbbfb1f159e0c36d30.js"></script><link href="/integral-mall/css/main.6ef643711f90ba4f07c5.css" rel="stylesheet"></head><body><div id="app"><div class="el-loading-spinner" style="width: 98%;"><svg viewBox="25 25 50 50" class="circular"><circle cx="50" cy="50" r="20" fill="none" class="path"></circle></svg></div></div><script>(function() {
=======
<!doctype html><html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="stylesheet" href="./static/css/iconfont.css"><link rel="stylesheet" href="./static/css/common.css"><link rel="shortcut icon" type="image/x-icon" href="./static/img/favicon.ico"><title></title><script defer="defer" src="/integral-mall/js/main.a55a5d978dc349a8d8aa.js"></script><link href="/integral-mall/css/main.837a11199f0b9096415d.css" rel="stylesheet"></head><body><div id="app"><div class="el-loading-spinner" style="width: 98%;"><svg viewBox="25 25 50 50" class="circular"><circle cx="50" cy="50" r="20" fill="none" class="path"></circle></svg></div></div><script>(function() {
>>>>>>> feature/巴拉积分购
var src = '/component/static/import-component.js?timestrap=' + new Date().getTime();
var host = window.location.host;
host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'www.gicdev.com' : host;
......
dist/js/main.a55a5d978dc349a8d8aa.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/main.a55a5d978dc349a8d8aa.js.LICENSE.txt 0 → 100644
/*!
* @overview es6-promise - a tiny implementation of Promises/A+.
* @copyright Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors (Conversion to ES6 API by Jake Archibald)
* @license Licensed under MIT license
* See https://raw.githubusercontent.com/stefanpenner/es6-promise/master/LICENSE
* @version v4.2.6+9869a4bc
*/
/*!
* clipboard.js v2.0.1
* https://zenorocha.github.io/clipboard.js
*
* Licensed MIT © Zeno Rocha
*/
/*!
* vue-treeselect v0.0.35 | (c) 2017-2018 Riophae Lee
* Released under the MIT License.
* https://vue-treeselect.js.org/
*/
/**!
* Sortable 1.10.2
* @author RubaXa <trash@rubaxa.org>
* @author owenm <owen23355@gmail.com>
* @license MIT
*/
dist/js/main.ecbbbfb1f159e0c36d30.js
This source diff could not be displayed because it is too large. You can view the blob instead.
src/App.vue
......@@ -23,6 +23,11 @@ export default {
request.get('/api-auth/get-login-user-info').then(res => {
if (res.data.errorCode === 0) {
this.userId = res.data.result.userId;
const limitCodeType = res.data.result.limitCodeList;
if (limitCodeType) {
const jifenquanxian = limitCodeType.indexOf('integralCashPurchase') != -1;
localStorage.setItem('limitCodeType', jifenquanxian);
}
} else {
this.$message.error(res.data.message);
}
......
src/assets/theme/index.css
......@@ -47126,7 +47126,8 @@
.el-popover {
position: absolute;
background: #fff;
min-width: 150px;
/* min-width: 150px; */
min-width: auto;
border-radius: 4px;
border: 1px solid #ebeef5;
padding: 12px;
src/components/getSkuList.vue
......@@ -28,7 +28,23 @@
<td :key="index3" v-for="(item3, index3) in item2" v-if="intergralModal.type === 'cash'">
<span v-if="item2.length - index3 > 2" style="width:120px;display:inline-block">{{ item3.valueName }}</span>
<p v-else>
<el-input v-model="item3.valueName" placeholder="请输入内容" @blur="inputLimit(item3, index3, item2)" />
<el-popover
popper-class="noClass"
v-if="jifenquanxian && intergralModal.headerList[index3].proName == '现金'"
placement="bottom"
trigger="hover"
content="无积分购现金权限">
<el-input slot="reference"
v-model="item3.valueName"
placeholder="请输入内容"
:disabled="jifenquanxian && intergralModal.headerList[index3].proName == '现金'"
@blur="inputLimit(item3, index3, item2)" />
</el-popover>
<el-input
v-else
v-model="item3.valueName"
placeholder="请输入内容"
@blur="inputLimit(item3, index3, item2)" />
</p>
</td>
</tr>
......@@ -50,7 +66,23 @@
/>
</p>
<p><el-input v-model="giftProSkuIntegral" placeholder="请输入内容" @blur="limitSkuIntegral" /></p>
<p><el-input v-model="giftProSkuCash" placeholder="请输入内容" @blur="limitSkuCash" /></p>
<p >
<el-popover
placement="bottom"
trigger="hover"
v-if="jifenquanxian"
content="无积分购现金权限">
<el-input slot="reference"
v-model="giftProSkuCash"
placeholder="请输入内容"
@blur="limitSkuCash"
:disabled="jifenquanxian" />
</el-popover>
<el-input v-else
v-model="giftProSkuCash"
placeholder="请输入内容"
@blur="limitSkuCash" />
</p>
</div>
</div>
<div class="gift-spu" v-if="intergralModal.type === 'stock' && intergralModal.tableSkuData.length === 0">
......@@ -80,6 +112,7 @@ export default {
},
data () {
return {
jifenquanxian: '',
payload: [],
giftProSkuCode: '',
giftProSkuIntegral: '',
......@@ -89,6 +122,7 @@ export default {
};
},
created () {
this.jifenquanxian = localStorage.getItem('limitCodeType') == 'true';
if (this.intergralModal.type === 'cash') {
this.title = '编辑积分费用或现金费用';
} else if (this.intergralModal.type === 'stock') {
......@@ -101,6 +135,12 @@ export default {
this.virtualStock = this.intergralModal.virtualStock; // 库存
this.currentStock = this.intergralModal.virtualStock;
},
// mounted () {
// setTimeout(_ => {
// this.jifenquanxian = localStorage.getItem('limitCodeType') == 'true';
// console.log(typeof this.jifenquanxian, ((!this.jifenquanxian) == false), 'this.jifenquanxian');
// }, 500);
// },
methods: {
limitSkuCode () {
const reg = /^[0-9a-zA-Z\-]+?$/;
......@@ -132,6 +172,7 @@ export default {
}
},
limitSkuCash () {
if (this.jifenquanxian) return;
if (Number(this.giftProSkuCash) < 0) {
this.$message.error('请输入大于0的数字');
this.giftProSkuCash = '';
......@@ -197,7 +238,7 @@ export default {
} else {
item2.valueName = Number(item2.valueName).toFixed(0);
}
} else if (item1.length - index2 === 1) {
} else if (item1.length - index2 === 1 && !this.jifenquanxian) {
// 现金
// 现金
if (Number(item2.valueName < 0)) {
......@@ -367,7 +408,7 @@ export default {
},
};
</script>
<style scoped>
<style lang="less" scoped>
.spu-table {
width: 580px;
font-size: 14px;
......
src/components/updataCash.vue
......@@ -22,14 +22,32 @@
</el-table-column>
<el-table-column prop="cashCost" label="现金">
<template slot-scope="scope">
<el-input-number
v-model="scope.row.cashCost"
:precision="2"
:min="0"
controls-position="right"
@blur="handleIntegralCostTotal"
@change="handleIntegralCostTotal"
/>
<el-popover
popper-class="noClass"
v-if="jifenquanxian == true"
placement="bottom"
trigger="hover"
content="无积分购现金权限">
<el-input-number
slot="reference"
:disabled="jifenquanxian"
v-model="scope.row.cashCost"
:precision="2"
:min="0"
controls-position="right"
@blur="handleIntegralCostTotal"
@change="handleIntegralCostTotal"
/>
</el-popover>
<el-input-number
v-else
v-model="scope.row.cashCost"
:precision="2"
:min="0"
controls-position="right"
@blur="handleIntegralCostTotal"
@change="handleIntegralCostTotal"
/>
</template>
</el-table-column>
</el-table>
......@@ -48,7 +66,23 @@
</el-table-column>
<el-table-column prop="cashCost" label="现金">
<template slot-scope="scope">
<el-input-number
<el-popover
popper-class="noClass"
v-if="jifenquanxian == true"
placement="bottom"
trigger="hover"
content="无积分购现金权限">
<el-input-number
slot="reference"
:disabled="jifenquanxian"
v-model="scope.row.cashCost"
:precision="2"
:min="0"
controls-position="right"
/>
</el-popover>
<el-input-number
v-else
:disabled="cardCostList.length > 1"
v-model="scope.row.cashCost"
:precision="2"
......@@ -84,12 +118,14 @@ export default {
},
data () {
return {
jifenquanxian: '',
dialogVisible: true,
cardCostList: [],
tableData: [],
};
},
created () {
this.jifenquanxian = localStorage.getItem('limitCodeType') == 'true';
this.getList();
},
methods: {
......
src/views/activities/flashSale/detail.vue
......@@ -276,7 +276,23 @@
/>
</div>
<div v-if="!(row.giftType && row.children && row.children.length) && !isEdit" class="mt10">
<el-popover
popper-class="noClass"
v-if="jifenquanxian"
placement="bottom"
trigger="hover"
content="无积分购现金权限">
<el-input
slot="reference"
v-model.trim="row.activityPrice"
:disabled="jifenquanxian"
placeholder="输入现金"
size="small"
class="w-110"
/>
</el-popover>
<el-input
v-else
v-model.trim="row.activityPrice"
:disabled="!row.activityProStatus"
placeholder="输入现金"
......@@ -533,6 +549,7 @@ export default {
},
data () {
return {
jifenquanxian: '',
pickerOptions: {
disabledDate (time) {
// disabledDate 文档上：设置禁用状态，参数为当前日期，要求返回 Boolean
......@@ -625,6 +642,7 @@ export default {
},
},
created () {
this.jifenquanxian = localStorage.getItem('limitCodeType') == 'true';
// this.isEdit = this.$route.query.edit;
this.isEdit = !!this.$route.query.activityId;
this.activityId = this.$route.query.activityId;
......
src/views/goods/coupon/detail.vue
......@@ -193,7 +193,25 @@
</el-table-column>
<el-table-column label="现金费用">
<template slot-scope="scope">
<el-popover
popper-class="noClass"
v-if="jifenquanxian == true"
placement="bottom"
trigger="hover"
content="无积分购现金权限">
<el-input-number
slot="reference"
:disabled="jifenquanxian"
v-model="scope.row.cashCost"
:precision="2"
:min="0"
controls-position="right"
@blur="handleIntegralCostTotal"
@change="handleIntegralCostTotal"
/>
</el-popover>
<el-input-number
v-else
v-model="scope.row.cashCost"
:precision="2"
:min="0"
......@@ -215,7 +233,23 @@
/>
</el-form-item>
<el-form-item label="现金费用" prop="cashCost">
<el-popover
popper-class="noClass"
v-if="jifenquanxian == true"
placement="bottom"
trigger="hover"
content="无积分购现金权限">
<el-input-number
slot="reference"
class="w-350"
:disabled="jifenquanxian"
:precision="2"
:min="0"
v-model="couponForm.cashCost"
/>
</el-popover>
<el-input-number
v-else
class="w-350"
:disabled="cardCouponList.length > 1"
:precision="2"
......@@ -331,7 +365,24 @@
<el-input size="small" v-model.trim="list3[index].skuList[0].giftProSkuIntegral" style="width:180px" />
</el-form-item>
<el-form-item label="现金">
<el-input size="small" v-model.trim="list3[index].skuList[0].giftProSkuCash" style="width:180px" />&nbsp;&nbsp;元
<el-popover
popper-class="noClass"
v-if="jifenquanxian == true"
placement="bottom"
trigger="hover"
content="无积分购现金权限">
<el-input
slot="reference"
:disabled="jifenquanxian"
size="small"
v-model.trim="list3[index].skuList[0].giftProSkuCash"
style="width:180px" />
</el-popover>
<el-input
v-else
size="small"
v-model.trim="list3[index].skuList[0].giftProSkuCash"
style="width:180px" />&nbsp;&nbsp;元
</el-form-item>
</el-form>
</el-tab-pane>
......@@ -582,6 +633,7 @@ export default {
}
};
return {
jifenquanxian: '',
addCardMax: 15, // 添加卡券的上限数量
ladder: [],
isDifferentialPricing: '',
......@@ -719,6 +771,7 @@ export default {
},
},
mounted () {
this.jifenquanxian = localStorage.getItem('limitCodeType') == 'true';
this.getOpenStatus();
this.getUserId();
window.onbeforeunload = function (e) {
......@@ -845,6 +898,10 @@ export default {
break;
}
if ((skuList[j].giftProSkuCash === '' || skuList[j].giftProSkuCash === null) && skuList[j].giftProSkuIntegral) {
if (this.jifenquanxian) {
skuList[j].giftProSkuCash = 0.00;
return;
}
this.isCorrect = false;
this.$message.error('已填入积分，则必填现金');
break;
......@@ -1385,7 +1442,11 @@ export default {
}
if (this.cardCouponList.length > 1) {
for (const item of this.cardCouponList) {
if (item.cashCost === undefined || item.integralCost === undefined) {
if (item.integralCost === undefined) {
this.$message.error('卡券积分不能为空');
return false;
}
if (item.cashCost === undefined && !this.jifenquanxian) {
this.$message.error('卡券积分或现金不能为空');
return false;
}
......
src/views/goods/gift/addSku.vue
......@@ -110,13 +110,30 @@
class="w-100 margin-right10 vertical-top"
@blur="limitIntergral(intergral)"
/>
<el-input
v-model="cash"
placeholder="现金"
size="small"
class="w-100 margin-right10 vertical-top"
@blur="limitCash"
/>
<el-popover
popper-class="noClass"
v-if="jifenquanxian"
placement="bottom"
trigger="hover"
content="无积分购现金权限">
<el-input
slot="reference"
:disabled="jifenquanxian"
v-model="cash"
placeholder="现金"
size="small"
class="w-100 margin-right10 vertical-top"
@blur="limitCash"
/>
</el-popover>
<el-input
v-else
v-model="cash"
placeholder="现金"
size="small"
class="w-100 margin-right10 vertical-top"
@blur="limitCash"
/>
<el-input
v-model="stock"
placeholder="库存"
......@@ -176,11 +193,27 @@
<td :key="index2" style="width:120px" v-if="item1.length - index2 > 1">
<!-- {{ item1[7] }} -->
<span v-if="item1.length - index2 < 7">
<el-popover
popper-class="noClass"
v-if="jifenquanxian"
placement="bottom"
trigger="hover"
content="无积分购现金权限">
<el-input
slot="reference"
size="small"
v-model.trim="item2.valueName"
@blur="skuInput(item1, item2, index1, index2)"
@input="setSkuValueName"
:disabled="jifenquanxian && index2 == 2"
/>
</el-popover>
<el-input
size="small"
v-model.trim="item2.valueName"
@blur="skuInput(item1, item2, index1, index2)"
@input="setSkuValueName"
v-else
/>
</span>
......@@ -232,6 +265,7 @@ export default {
},
data () {
return {
jifenquanxian: '',
// skuJson: [],
standardList: [], // 规格列表
standardValueList: [], // 规格值列表
......@@ -240,7 +274,7 @@ export default {
uploadAction: window.location.origin + '/api-plug/upload-img?requestProject=intergral-mall',
// uploadAction: 'http://www.gicdev.com/api-plug/upload-img?requestProject=intergral-mall',
intergral: '',
cash: '',
cash: 0.00,
stock: '',
code: '',
barCode: '',
......@@ -256,6 +290,7 @@ export default {
};
},
created () {
this.jifenquanxian = localStorage.getItem('limitCodeType') == 'true';
// this.skuList = copy(this.combine(copy(this.skuJson)));
},
methods: {
......@@ -598,17 +633,18 @@ export default {
// 现金
limitCash () {
if (this.jifenquanxian) return;
if (Number(this.cash) === 0) {
return false;
} else if (!Number(this.cash)) {
this.$message.error('请输入数字类型');
this.cash = '';
this.cash = 0.00;
} else if (Number(this.cash) < 0) {
this.$message.error('请输入大于0的数字');
this.cash = '';
this.cash = 0.00;
} else if (Number(this.cash) > 9999999) {
this.$message.error('现金最大9999999');
this.cash = '';
this.cash = 0.00;
} else {
this.cash = Number(this.cash).toFixed(2);
}
......@@ -748,6 +784,7 @@ export default {
item2.valueName = Number(item2.valueName).toFixed(0);
}
} else if (item1.length - index2 === 5) {
if (this.jifenquanxian) return;
// 现金
if (Number(item2.valueName < 0)) {
this.$message.error('请输入大于0的数字');
......
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