Skip to content

I
integral-mall
Commit 05359b45 by crushh
Options

update: dist

parents 259a7e7c e7c51cef
Showing with 188 additions and 85 deletions
dist/css/main.5560447c835b16efd01c.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/css/main.60899977f5b64cc4b4da.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/index.html
<!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.40fff01b81077bfa22ad.js"></script><link href="/integral-mall/css/main.60899977f5b64cc4b4da.css" rel="stylesheet"></head><body><div id="app"></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.061f3c21b55399e2d45e.js"></script><link href="/integral-mall/css/main.5560447c835b16efd01c.css" rel="stylesheet"></head><body><div id="app"></div><script>(function() {
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 ? 'gicdev.demogic.com' : host;
......
dist/js/main.061f3c21b55399e2d45e.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/main.40fff01b81077bfa22ad.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main.js
......@@ -2,7 +2,6 @@
// (runtime-only or standalone) has been set in webpack.base.conf with an alias.
import 'babel-polyfill';
import promise from 'es6-promise';
promise.polyfill();
import Vue from 'vue';
import App from './App';
import router from './router';
......@@ -11,7 +10,8 @@ import VueAxios from 'vue-axios';
import store from './store';
import './assets/theme/index.css';
import '../static/fonts/iconfont.js';
import limit from '@/utils/limiting';
promise.polyfill();
Vue.use(VueAxios, axios);
// import vueGicStoreLinkage from '@gic-test/vue-gic-store-linkage';
// Vue.use(vueGicStoreLinkage);
......@@ -20,16 +20,14 @@ Vue.axios.defaults.withCredentials = true; // 跨域cookie访问
Vue.config.productionTip = false;
/* eslint-disable no-new */
/* eslint-disable no-new */
limit({
createApp() {
new Vue({
el: '#app',
router,
store,
components: { App },
template: '<App/>'
});
}
window.getLimit(router, 'integral-mall').then(() => {
new Vue({
el: '#app',
router,
store,
components: { App },
template: '<App/>',
});
});
// new Vue({
......
src/views/setting/convenSet.vue
......@@ -3,7 +3,9 @@
<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 :to="{ path: '' }">
<a href="/report/#/memberSummary">首页</a>
</el-breadcrumb-item>
<el-breadcrumb-item>积分商城</el-breadcrumb-item>
<el-breadcrumb-item>设置</el-breadcrumb-item>
<el-breadcrumb-item>常规设置</el-breadcrumb-item>
......@@ -13,7 +15,14 @@
</h3>
</div>
<div class="section">
<el-form :model="form" ref="form" :rules="formRules" label-width="150px" class="demo-ruleForm" label-position="right">
<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>
......@@ -21,16 +30,20 @@
</el-select>
</el-form-item> -->
<h2 class="icon-type-title">
<div class="mark"></div>
<div class="mark" />
商品设置
</h2>
<el-form-item prop="openAutoShelf" label="无库存自动下架">
<el-switch v-model="form.openAutoShelf"></el-switch>
<el-switch v-model="form.openAutoShelf" />
</el-form-item>
<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 label="1">
服务门店
</el-checkbox>
<el-checkbox label="2">
协管门店
</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item prop="openAutoShelf" label="库存提示文案">
......@@ -38,37 +51,71 @@
<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>
<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>
<el-checkbox
style="vertical-align: top;margin-right: 10px"
v-model="form.stockShow"
:true-label="1"
:false-label="0"
>
展示
</el-checkbox>
<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>
<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>
<div class="mark" />
订单设置
</h2>
<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-switch
v-model="form.autoConfirmReceipt"
:active-value="1"
:inactive-value="0"
@change="form.autoConfirmReceiptDay = null"
/>
</el-form-item>
<el-form-item prop="autoConfirmReceiptDay" v-if="form.autoConfirmReceipt === 1" :rules="[{ required: true, message: '请选择自动收货天数' }]" label="自动确认收货时间">
<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-option label="7" :value="7" />
<el-option label="15" :value="15" />
<el-option label="30" :value="30" />
</el-select>
天，自动确认收货
</div>
</el-form-item>
<div class="confim-btn" :style="{ width: fixedWidth + 'px' }">
<el-form-item class="fix-btn">
<el-button type="primary" @click="handleSubmit('form')" :loading="btnLoading">保存</el-button>
<el-button
type="primary"
@click="handleSubmit('form')"
:loading="btnLoading"
v-if="$getButtonLimit($buttonCode.convenSetSave)"
:limit-code="$buttonCode.convenSetSave"
>
保存
</el-button>
</el-form-item>
</div>
</el-form>
......@@ -83,7 +130,8 @@ import request from '../../service/request.js';
// import getInputVal from '../../utils/common.js';
export default {
data() {
components: {},
data () {
return {
form: {
cardType: '',
......@@ -92,28 +140,28 @@ export default {
autoConfirmReceipt: 0,
autoConfirmReceiptDay: null,
stockShow: 0,
stockShowAmount: undefined
stockShowAmount: undefined,
},
formRules: {
cardType: [{ required: true, message: '请选择积分消耗卡', trigger: 'change' }],
openAutoShelf: [{ required: true, message: '请设置无库存自动下架', trigger: 'change' }],
showStoreType: [{ required: true, message: '请至少勾选一个门店类型', trigger: 'change' }]
showStoreType: [{ required: true, message: '请至少勾选一个门店类型', trigger: 'change' }],
},
btnLoading: false,
fixedWidth: document.documentElement.clientWidth - 200
fixedWidth: document.documentElement.clientWidth - 200,
};
},
created() {
created () {
this.getMess();
},
methods: {
getMess() {
getMess () {
request.get('/api-integral-mall/get-card-config').then(res => {
if (res.data.errorCode === 0) {
this.form.cardType = res.data.result.cardType || '';
this.form.autoConfirmReceipt = res.data.result.autoConfirmReceipt || 0;
this.form.autoConfirmReceiptDay = res.data.result.autoConfirmReceiptDay || null;
this.form.openAutoShelf = res.data.result.openAutoShelf === 1 ? true : false;
this.form.openAutoShelf = res.data.result.openAutoShelf === 1;
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;
......@@ -122,18 +170,18 @@ export default {
}
});
},
handleSubmit(form) {
handleSubmit (form) {
if (!this.form.stockShowAmount) return this.$message.warning('请输入库存提示文案数量限制');
this.$refs[form].validate(valid => {
console.log(valid);
if (valid) {
let params = {
const params = {
// cardType: this.form.cardType,
autoConfirmReceipt: this.form.autoConfirmReceipt,
openAutoShelf: this.form.openAutoShelf ? 1 : 0,
showStoreType: this.form.showStoreType.join(','),
stockShow: this.form.stockShow,
stockShowAmount: this.form.stockShowAmount
stockShowAmount: this.form.stockShowAmount,
};
if (params.autoConfirmReceipt === 1) params.autoConfirmReceiptDay = this.form.autoConfirmReceiptDay;
this.btnLoading = true;
......@@ -150,12 +198,14 @@ export default {
return false;
}
});
}
},
},
components: {}
};
</script>
<style scoped lang="less">
.mall-section-container {
padding-bottom: 58px;
}
.section {
background: #fff;
margin: 24px;
......
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