Skip to content

I
integral-mall
Commit 736a953a by damodmg
Options

Merge branch 'dev' into 'master' 

Dev

See merge request !42
parents f2524621 ec0402aa
Showing with 70 additions and 32 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.a5c4c504f259dfe16647a432e432d134.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.02.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.864324ca201c19c8f144.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.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.02.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
dist/static/css/common.css
......@@ -347,21 +347,21 @@ input[type="number"] {
-moz-appearance: textfield;
}
.el-input__inner{
/* .el-input__inner{
line-height:0px!important;
}
.el-input__inner::-webkit-input-placeholder {
line-height:normal
line-height:normal!important;
}
::-moz-placeholder {
line-height:normal
line-height:normal!important;
}
:-ms-input-placeholder {
line-height:normal
}
line-height:normal!important;
} */
.icon-xinxixianshi{
color: #909399;
font-size: 14px;
......
dist/static/js/app.864324ca201c19c8f144.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/app.b68de82f60ec8fe0bf79.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/goods/coupon/coupon.vue
......@@ -19,7 +19,7 @@
<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 class="search-item">
<el-select v-model="shelf" placeholder="上下架状态" clearable class="w-140" @change="getList">
<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-select>
......@@ -108,7 +108,7 @@
</el-table>
<div class="pagination-conteiner" v-show="tableDate.length > 0">
<div class="pagination">
<el-pagination 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>
<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>
......@@ -214,6 +214,10 @@ export default {
this.currentPage = 1;
this.getList();
},
getListCurr() {
this.currentPage = 1;
this.getList();
},
// 排序
sortChange(value) {
this.sortColumn = value.prop;
......@@ -321,6 +325,7 @@ export default {
if (res.data.errorCode === 0) {
let text = Number(type) === 0 ? '删除成功' : Number(type) === 1 ? '下架成功' : '上架成功';
this.$message.success(text);
this.currentPage = 1;
this.getList(); //拉取列表
this.goodsType = '';
} else {
......
src/views/goods/coupon/info.vue
......@@ -532,12 +532,13 @@ export default {
}
}
params.timeZones = timeLink.join('#');
this.submitLoading = true;
request.post('/api-integral-mall/create-integral-pro', params).then(res => {
if (res.data.errorCode === 0) {
this.submitLoading = false;
this.$router.push({
name: 'coupon'
});
this.submitLoading = false;
} else {
this.$message.error(res.data.message);
this.submitLoading = false;
......
src/views/goods/gift/gift.vue
......@@ -19,13 +19,13 @@
<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 class="search-item">
<el-select v-model="shelf" placeholder="上下架状态" clearable class="w-140" @change="getList">
<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-select>
</div>
<div class="search-item">
<el-select v-model="giftType" placeholder="礼品类型" clearable class="w-140" @change="getList">
<el-select v-model="giftType" placeholder="礼品类型" clearable class="w-140" @change="getListCurr">
<el-option label="实物礼品" :value="1"></el-option>
<el-option label="虚拟礼品" :value="2"></el-option>
</el-select>
......@@ -124,7 +124,7 @@
</el-table>
<div class="pagination-conteiner" v-show="tableDate.length > 0">
<div class="pagination">
<el-pagination 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>
<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>
......@@ -216,7 +216,10 @@ export default {
this.$router.push({ name: 'giftExchange', query: { integralMallProId: item.integralMallProId } });
}
},
getListCurr() {
this.currentPage = 1;
this.getList();
},
// 获取列表
getList() {
let params = {
......@@ -375,6 +378,7 @@ export default {
if (res.data.errorCode === 0) {
let text = Number(type) === 0 ? '删除成功' : Number(type) === 1 ? '下架成功' : '上架成功';
this.$message.success(text);
this.currentPage = 1;
this.getList(); //拉取列表
this.goodsType = '';
} else {
......
src/views/goods/gift/info.vue
......@@ -1206,13 +1206,14 @@ export default {
}
}
params.timeZones = timeLink.join('#');
this.submitLoading = true;
request.post('/api-integral-mall/create-integral-pro', params).then(res => {
if (res.data.errorCode === 0) {
this.submitLoading = false;
this.$message.success('保存成功');
this.$router.push({
name: 'gift'
});
this.submitLoading = false;
} else {
this.$message.error(res.data.message);
this.submitLoading = false;
......
src/views/order/agreeRefund.vue
......@@ -10,7 +10,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancelSubmit('agreeRefundModal')">取 消</el-button>
<el-button type="primary" @click="submitProNanme('agreeRefundModal')">确 定</el-button>
<el-button type="primary" @click="submitProNanme('agreeRefundModal')" :loading="submitLoading">确 定</el-button>
</div>
</el-dialog>
</template>
......@@ -61,7 +61,8 @@ export default {
modalRules: {
refundPoint: [{ required: true, message: '请输入积分', trigger: 'blur' }, { validator: refundPointValidator, trigger: 'blur' }],
refundMoney: [{ required: true, message: '请输入金额', trigger: 'blur' }, { validator: refundMoneyValidator, trigger: 'blur' }]
}
},
submitLoading: false //按钮禁止重复提交
};
},
created() {
......@@ -74,7 +75,7 @@ export default {
this.agreeRefundModal.refundMoney = Number(this.agreeRefundModal.refundMoney).toFixed(2);
}
},
//确认修改商品名称
//确认提交
submitProNanme(formName) {
this.$refs[formName].validate(valid => {
if (valid) {
......@@ -83,13 +84,16 @@ export default {
refundMoney: this.agreeRefundModal.refundMoney,
refundPoint: this.agreeRefundModal.refundPoint
};
this.submitLoading = true;
request.get('/api-integral-mall/agree-refund', { params }).then(res => {
if (res.data.errorCode === 0) {
this.$message.success('修改成功');
this.agreeRefundModal.dialogVisible = false;
this.submitLoading = false;
this.$emit('getList');
} else {
this.$message.error(res.data.message);
this.submitLoading = false;
}
});
} else {
......
src/views/order/closeOrder.vue
......@@ -10,7 +10,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancelSubmit('refundForm')">取 消</el-button>
<el-button type="primary" @click="submitProNanme('refundForm')">确 定</el-button>
<el-button type="primary" @click="submitProNanme('refundForm')" :loading="submitLoading">确 定</el-button>
</div>
</el-dialog>
</template>
......@@ -34,6 +34,7 @@ export default {
refundForm: {
closeReason: ''
},
submitLoading: false,
modalRules: {
closeReason: [{ required: true, message: '请输入关闭原因', trigger: 'blur' }]
}
......@@ -47,7 +48,7 @@ export default {
this.reasonLen = getInputVal.getZhLen(this.refundForm.closeReason);
});
},
//确认修改商品名称
//确认
submitProNanme(formName) {
this.$refs[formName].validate(valid => {
if (valid) {
......@@ -56,13 +57,16 @@ export default {
cancelReason: this.refundForm.closeReason,
optType: 2
};
this.submitLoading = true;
request.get('/api-integral-mall/order-opt', { params }).then(res => {
if (res.data.errorCode === 0) {
this.$message.success('关闭订单成功');
this.refunOrderdModal.dialogVisible = false;
this.submitLoading = false;
this.$emit('getList');
} else {
this.$message.error(res.data.message);
this.submitLoading = false;
}
});
} else {
......
src/views/order/closeRefund.vue
......@@ -8,7 +8,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancelSubmit('refundForm')">取 消</el-button>
<el-button type="primary" @click="submitProNanme('refundForm')">确 定</el-button>
<el-button type="primary" @click="submitProNanme('refundForm')" :loading="submitLoading">确 定</el-button>
</div>
</el-dialog>
</template>
......@@ -32,6 +32,7 @@ export default {
refundForm: {
reason: ''
},
submitLoading: false,
modalRules: {
reason: [{ required: true, message: '请输入关闭原因', trigger: 'blur' }]
}
......@@ -53,13 +54,16 @@ export default {
integralMallProRefundId: this.refundModal.integralMallProRefundId,
reason: this.refundForm.reason
};
this.submitLoading = true;
request.get('/api-integral-mall/refuse-refund', { params }).then(res => {
if (res.data.errorCode === 0) {
this.$message.success('修改成功');
this.refundModal.dialogVisible = false;
this.submitLoading = false;
this.$emit('getList');
} else {
this.$message.error(res.data.message);
this.submitLoading = false;
}
});
} else {
......
src/views/order/couponExchange.vue
......@@ -125,7 +125,7 @@
</div>
<div class="pagination-conteiner" style="background:#fff;margin:-50px 24px 0 24px">
<div class="pagination">
<el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="pageNum" :page-sizes="pageSizes" :page-size="pageSize" layout="total, sizes, prev, pager, next" :total="total"> </el-pagination>
<el-pagination v-if="total != 0" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="pageNum" :page-sizes="pageSizes" :page-size="pageSize" layout="total, sizes, prev, pager, next" :total="total"> </el-pagination>
</div>
</div>
</el-tabs>
......@@ -304,6 +304,7 @@ export default {
this.beginTime = '';
this.endTime = '';
}
this.currentPage = 1;
this.getList();
},
//获取列表
......
src/views/order/delive.vue
......@@ -27,7 +27,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancelSubmit('deliverdModal')">取 消</el-button>
<el-button type="primary" @click="submitProNanme('deliverdModal')">确 定</el-button>
<el-button type="primary" @click="submitProNanme('deliverdModal')" :loading="submitLoading">确 定</el-button>
</div>
</el-dialog>
</template>
......@@ -61,6 +61,7 @@ export default {
otherLogisticsCompanyName: [{ required: true, message: '请输入快递公司名称', trigger: 'blur' }],
content: [{ required: true, message: '请输入在线发货的内容', trigger: 'blur' }]
},
submitLoading: false,
logistiesList: [] //快递公司
};
},
......@@ -139,13 +140,16 @@ export default {
params.logisticsCompanyName = '';
params.courierNumber = '';
}
this.submitLoading = true;
request.get('/api-integral-mall/order-opt', { params }).then(res => {
if (res.data.errorCode === 0) {
this.$message.success('发货成功');
this.deliverdModal.dialogVisible = false;
this.submitLoading = false;
this.$emit('getList');
} else {
this.$message.error(res.data.message);
this.submitLoading = false;
}
});
} else {
......
src/views/order/giftExchange.vue
......@@ -20,7 +20,7 @@
<el-date-picker class="date-picker" @change="changeTime" v-model="dateValue" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</div>
<div class="search-item">
<el-select v-model="changeType" placeholder="配送方式" clearable @change="getList" style="width:160px;">
<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-select>
......@@ -130,7 +130,7 @@
</div>
<div class="pagination-conteiner" style="background:#fff;margin:-50px 24px 0 24px">
<div class="pagination">
<el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="pageNum" :page-sizes="pageSizes" :page-size="pageSize" layout="total, sizes, prev, pager, next" :total="total"> </el-pagination>
<el-pagination v-if="total != 0" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="pageNum" :page-sizes="pageSizes" :page-size="pageSize" layout="total, sizes, prev, pager, next" :total="total"> </el-pagination>
</div>
</div>
</el-tabs>
......@@ -337,6 +337,10 @@ export default {
this.currentPage = 1;
this.getList();
},
getListCurr() {
this.currentPage = 1;
this.getList();
},
// 分页
handleSizeChange(size) {
//设置每页条数
......@@ -385,6 +389,7 @@ export default {
this.beginTime = '';
this.endTime = '';
}
this.currentPage = 1;
this.getList();
},
//获取列表
......
src/views/order/refundList.vue
......@@ -20,7 +20,7 @@
<el-date-picker class="date-picker" @change="changeTime" v-model="dateValue" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</div>
<div class="search-item">
<el-select v-model="refundType" placeholder="退款方式" clearable class="w-140" @change="getList">
<el-select v-model="refundType" placeholder="退款方式" clearable class="w-140" @change="getListCurr">
<el-option label="仅退款" :value="1"></el-option>
<el-option label="退货退款" :value="2"></el-option>
</el-select>
......@@ -124,7 +124,7 @@
</div>
<div class="pagination-conteiner" style="background:#fff;margin:-50px 24px 0 24px">
<div class="pagination">
<el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="pageNum" :page-sizes="pageSizes" :page-size="pageSize" layout="total, sizes, prev, pager, next" :total="total"> </el-pagination>
<el-pagination v-if="total != 0" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="currentPage" :page-sizes="pageSizes" :page-size="pageSize" layout="total, sizes, prev, pager, next" :total="total"> </el-pagination>
</div>
</div>
</el-tabs>
......@@ -221,6 +221,10 @@ export default {
this.currentPage = 1;
this.getList();
},
getListCurr() {
this.currentPage = 1;
this.getList();
},
// 排序
sortChange(value) {
this.sortColumn = value.prop;
......@@ -240,6 +244,7 @@ export default {
this.startTime = '';
this.endTime = '';
}
this.currentPage = 1;
this.getList();
},
//获取退款列表
......
static/css/common.css
......@@ -347,21 +347,21 @@ input[type="number"] {
-moz-appearance: textfield;
}
.el-input__inner{
/* .el-input__inner{
line-height:0px!important;
}
.el-input__inner::-webkit-input-placeholder {
line-height:normal
line-height:normal!important;
}
::-moz-placeholder {
line-height:normal
line-height:normal!important;
}
:-ms-input-placeholder {
line-height:normal
}
line-height:normal!important;
} */
.icon-xinxixianshi{
color: #909399;
font-size: 14px;
......
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