Skip to content

S
shop-new
提交 7cb6808a authored 作者: huaxinzhu's avatar huaxinzhu
浏览文件
操作

1、提现申请，js计算和提示拦截优化；2、商品信息，服务标签互斥需求；3、商品信息，运费模板，修改操作bug；4、订单列表，修复查看物流bug；

上级 9de31266
显示空白字符变更
内嵌 并排
正在显示 包含 116 行增加 和 51 行删除
src/views/index.vue
浏览文件 @ 7cb6808a
......@@ -192,7 +192,7 @@ export default {
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped type="text/stylus">
.dashboard-promote .el-row{
margin-bottom: 20px;
......
src/views/system/asset/withdraw/index.vue
浏览文件 @ 7cb6808a
......@@ -17,7 +17,6 @@
</el-form-item>
<el-form-item label="可提现金额">
{{drawableCash}}元
<!--drawableCash-->
</el-form-item>
<el-form-item label="手续费">
当前手续费为{{newFee}}元
......@@ -107,7 +106,7 @@
//-----------
// 自定义高精度浮点数运算
add(arg1, arg2) {
var r1, r2, m;
let r1, r2, m, result;
try {
//取小数位长度
r1 = arg1.toString().split(".")[1].length;
......@@ -117,8 +116,9 @@
r2 = 0;
}
m = Math.pow(10, Math.max(r1, r2)); //计算因子
return (arg1 * m + arg2 * m) / m;
result = (arg1 * m + arg2 * m) / m;
result = result.toFixed(2);
return result;
},
minus(arg1, arg2) {
return this.add(arg1, -arg2);
......@@ -144,6 +144,8 @@
},
getCheckCodeFn() {
let numRegExp = /^[0-9]+(.[0-9]{2})?$/;
let numberMoney = Number(this.form.money);
let numberCash = Number(this.drawableCash);
if(this.form.bankId === '') {
this.$refs.form.validateField("bankId");
......@@ -159,10 +161,10 @@
return;
}
if (this.form.money > this.drawableCash) {
if (numberMoney > numberCash) {
this.$message({type: 'warning',message:'提现金额不足'});
return;
} else if (this.form.money < 100) {
} else if (numberMoney < 100) {
this.msgError("提现金额必须大于等于100");
return;
}
......@@ -186,16 +188,20 @@
let fee = 0.006;
this.form.money = event.target.value;
let numRegExp = /^[0-9]+(.[0-9]{2})?$/;
let numberMoney = Number(this.form.money);
let numberCash = Number(this.drawableCash);
if(this.form.money !== '') {
if(!numRegExp.test(this.form.money)) {
this.$message({ type: 'warning',message: '提现金额只能输入大于 0 的数字'});
return;
}
if (this.form.money > this.drawableCash) {
if (Number(this.form.money) > Number(this.drawableCash)) {
this.$message({type: 'warning',message:'提现金额不足！'});
return;
}
if (this.form.money < 100) {
if (Number(this.form.money) < 100) {
this.$message({type: 'warning',message:'提现金额需大于或者等于 100'});
return;
}
......@@ -203,7 +209,7 @@
}
},
//获取商户的信息
getSellerInfo() {
getSellerInfoFn() {
const sellerid = this.sellerId;
getSellerInfo({sellerId: sellerid}).then(response => {
this.sellerinfo = response.data;
......@@ -221,8 +227,8 @@
/** 查询商户提现列表 */
getList() {
this.getSellerInfo()
this.getBankcardList()
this.getSellerInfoFn();
this.getBankcardList();
},
// 取消按钮
cancel() {
......@@ -239,13 +245,16 @@
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
let numberMoney = Number(this.form.money);
let numberCash = Number(this.drawableCash);
this.form.sellerId = this.sellerId;
// 再次校验 提现信息
if(!this.form.sellerId) {
this.$message({type: 'error',message: '商户信息有误！'});
return;
}
if(this.form.money < 100 ) {
if(numberMoney < 100 ) {
this.$message({type: 'error',message: '提现金额不能小于100'});
return;
}
......
src/views/system/goods/add/components/goodsinfomation.vue
浏览文件 @ 7cb6808a
......@@ -11,10 +11,12 @@
<i style="color: #e3c300;font-size:16px" class="el-icon-question" slot="reference"></i>
</el-popover>
</el-form-item>
<el-form-item label="商品分类" prop="categoryId">
<el-cascader v-model="ruleForm.categoryId" :props='propsaddress' :options="options1" @change="handleChange"
style="width:400px;"></el-cascader>
</el-form-item>
<el-form-item label="市场原价" prop="scPrice">
<el-input v-model="ruleForm.scPrice" style="width:400px;"></el-input>
元
......@@ -23,6 +25,7 @@
<i style="color: #e3c300;font-size:16px" class="el-icon-question" slot="reference"></i>
</el-popover>
</el-form-item>
<el-form-item label="指导售价" prop="price">
<el-input v-model="ruleForm.price" style="width:400px;"></el-input>
元
......@@ -31,6 +34,7 @@
<i style="color: #e3c300;font-size:16px" class="el-icon-question" slot="reference"></i>
</el-popover>
</el-form-item>
<el-form-item label="结算价格" prop="jsPrice">
<el-input v-model="ruleForm.jsPrice" style="width:400px;"></el-input>
元
......@@ -41,9 +45,9 @@
</el-form-item>
<el-form-item label="运费模板" prop="freightId">
<el-radio-group v-model="ruleForm.resource">
<el-radio label="1">运费模板</el-radio>
<el-radio label="0">单独运费</el-radio>
<el-radio-group v-model="ruleForm.resource" @change="freightIdTypeChange">
<el-radio label='1'>运费模板</el-radio>
<el-radio label='0'>单独运费</el-radio>
</el-radio-group>
</el-form-item>
......@@ -65,6 +69,7 @@
<el-option label="72小时" value="72" ></el-option>
</el-select>
</el-form-item>
<el-form-item label="售后时长" prop="aftersaleTime">
<el-select v-model="ruleForm.aftersaleTime" style="width:400px;" placeholder="请选择售后时长">
<el-option label="7天" value="7" style="text-align:center;"></el-option>
......@@ -79,9 +84,11 @@
<el-form-item label="商品库存" prop="goodsNowStock">
<el-input v-model.number="ruleForm.goodsNowStock" style="width:400px;"></el-input>
</el-form-item>
<el-form-item label="商品产地" prop="producingArea">
<el-input v-model="ruleForm.producingArea " style="width:400px;"></el-input>
</el-form-item>
<el-form-item label="商品重量" prop="weight">
<el-input v-model="ruleForm.weight" style="width:400px;"></el-input>
克（g）
......@@ -89,11 +96,9 @@
<el-form-item label="商品单位" prop="unit">
<el-input v-model="ruleForm.unit" style="width:400px;"></el-input>
</el-form-item>
<!-- <el-form-item label="商品品牌" prop="goodsBrand">-->
<!-- <el-input v-model="ruleForm.goodsBrand" style="width:400px;"></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="商品品牌" prop="goodsBrand">
<el-select v-model="ruleForm.goodsBrand" style="width:400px;" @change="goodsBrandChange" placeholder="请选择品牌">
<el-select v-model="ruleForm.goodsBrand" style="width:400px;" filterable @change="goodsBrandChange" placeholder="请选择品牌">
<el-option
v-for="item in brandOtions"
:key="item.id"
......@@ -103,9 +108,11 @@
</el-select>
<el-link type="primary" @click="toBrand" :underline="false">添加品牌</el-link>
</el-form-item>
<el-form-item label="三方编号" prop="outGoodsId">
<el-input v-model="ruleForm.outGoodsId" style="width:400px;"></el-input>
</el-form-item>
<el-form-item label="附加运费" prop="pywlPrice" v-if="ruleForm.resource==0">
<el-input v-model="ruleForm.pywlPrice" style="width:400px;" placeholder="偏远地区六省"></el-input>
元
......@@ -117,7 +124,7 @@
</el-form-item>
<el-form-item label="服务标签" prop="serviceagsTags">
<el-checkbox-group v-model="serviceagsTags">
<el-checkbox v-for="item in tags" :label="item.id" true-label :key="item.id">{{item.tag}}</el-checkbox>
<el-checkbox v-for="item in tags" :label="item.id" true-label :key="item.id" :disabled="item.isdc" @change="serviceSingleChange(item.id)">{{item.tag}}</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item label="详情描述" style="height:600px; margin-bottom: 0;" prop="description">
......@@ -155,11 +162,11 @@
};
return {
tags: [
{id: 2, tag: "假一赔十"},
{id: 3, tag: "7天退换"},
{id: 4, tag: "不可退还"},
{id: 5, tag: "厂家直供"},
{id: 6, tag: "售后无忧"}
{id: 2, tag: "假一赔十", isdc: false},
{id: 3, tag: "7天退换", isdc: false},
{id: 4, tag: "不可退还", isdc: false},
{id: 5, tag: "厂家直供", isdc: false},
{id: 6, tag: "售后无忧", isdc: false}
],
propsaddress: {
label: 'label',
......@@ -183,9 +190,9 @@
weight: '',
unit: '', //单位
goodsBrand: '', //品牌
resource: "1",
resource: '1',
categoryId: 0,
freightId: '全国包邮通用模板', //运费模板ID
freightId: 310, //运费模板ID
wlPrice: '',
pywlPrice: '',
jsPrice: '', //协议价
......@@ -214,7 +221,6 @@
// 运费模板列表
freightList: [],
options1: []
}
},
components: {},
......@@ -233,24 +239,27 @@
},
ruleForm: {
handler(val, oldVal) {
val.description = this.content
val.serviceagsTags = this.serviceagsTags
this.$emit('infomationclick', val)
val.description = this.content;
val.serviceagsTags = this.serviceagsTags;
this.$emit('infomationclick', val);
},
deep: true
},
infomationdatas(curVal, oldVal) {
//console.log("商品信息子组件：",curVal);
console.log("商品信息子组件：",curVal);
if (curVal) {
curVal['resource'] = '0';
this.ruleForm = curVal;
if (curVal.wlPrice > 0) {
if(curVal.freightId == 0) {
this.ruleForm.resource = '0';
} else {
}else {
this.ruleForm.resource = '1';
}
this.content = this.ruleForm.description;
this.ruleForm.servicetagsTags.forEach((val) => {
// 初始化
this.serviceagsTags = [];
this.ruleForm.serviceagsTags.forEach((val) => {
if (val) {
let nid = parseInt(val);
this.serviceagsTags.push(nid);
......@@ -258,6 +267,9 @@
})
}
}
},
created() {
},
mounted() {
this.getCategory();
......@@ -265,6 +277,32 @@
this.getBrands();
},
methods: {
// 服务标签 中，7天退换和不可退换只能2选一
serviceSingleChange(id) {
let index4 = this.serviceagsTags.indexOf(4);
let index3 = this.serviceagsTags.indexOf(3);
if(id == 3) {
if( index4 > -1) {
this.serviceagsTags.splice(index4,1)
}
}
if(id == 4) {
if( index3 > -1) {
this.serviceagsTags.splice(index3,1)
}
}
console.log(307,this.ruleForm);
},
// 运费模板类型，change事件
freightIdTypeChange(val) {
// 0 单独运费 1 是运费模板
if(val === '1') {
if(this.ruleForm.freightId == 0) {
this.ruleForm.freightId = "全国包邮通用模板";
}
}
},
// 获取品牌信息
getBrands() {
getBrandsInf().then(res => {
......
src/views/system/goods/add/index.vue
浏览文件 @ 7cb6808a
......@@ -61,8 +61,8 @@
Goodsparameter
},
created() {
this.getParams();
this.getFreight();//运费模板数据，回显匹配专用
this.getParams();
},
methods: {
// 运费模板
......@@ -86,19 +86,18 @@
this.loading = true;
const goods_id = goodsId;
getGoods(goods_id).then(response => {
//console.log(89,response);
if(response.data.code === 1 && response.data.data) {
this.goodsOnsale = response.data.data.isOnsale;
// 对发货时效单独处理
if(response.data.data.Delayompensate == 0) {
response.data.data.Delayompensate = '';
}
// 运费模板单独处理
if(response.data.data.freightId === "全国包邮通用模板" || response.data.data.freightId == 0) {
response.data.data.freightId = 310;
}else {
if( this.expressTemplateIdList.indexOf(response.data.data.freightId) < 0) {
response.data.data.freightId = '原来绑定的运费模板已经被删除';
}
//response.data.data.freightId 返回的值类型有 0（string/number）|| ‘全国包邮通用模板’（string）|| 310(number)
let resourceType = '1'; // 为了单元框正常显示，先给一个默认值，// 字符串 ‘0’,代表 数据为单独运费
let serviceagsTagsVal = [];
if(response.data.data.ServiceagsTags) {
serviceagsTagsVal = JSON.parse(response.data.data.ServiceagsTags);
}
this.infomationdata = {
goodsId: response.data.data.goodsId,
......@@ -113,10 +112,12 @@
unit: response.data.data.unit,
goodsBrand: response.data.data.goodsBrand,
wlPrice: response.data.data.wlPrice,
pywlPrice: response.data.data.pywlPrice,
resource: resourceType,
Delayompensate: response.data.data.Delayompensate,
aftersaleTime: response.data.data.aftersaleTime,
mark: response.data.data.mark,
servicetagsTags: response.data.data.ServiceagsTags.split(','),
serviceagsTags: serviceagsTagsVal,
description: response.data.data.description,
freightId: response.data.data.freightId,
outGoodsId: response.data.data.outGoodsId,
......@@ -179,7 +180,21 @@
if(status === 1) {
this.params.applyStatus = 1;
}
if(this.params.resource == 0) {
this.params.freightId = 0;
}else if(this.params.resource == 1) {
this.params.wlPrice = 0;
this.params.pywlPrice = 0;
// 运费模板字段单独处理,兼容老数据
if(this.params.freightId === '全国包邮通用模板' || this.params.freightId == 0) {
this.params.freightId = 310;
}
}
console.log("gogogogog",this.params);
//return ;
// 商品信息 表单字段校验
let isGoodInfMsg = this.$refs['childGoodsInf'].validateGoodsInfForm();
// 商品图片 校验
......
src/views/system/order/index.vue
浏览文件 @ 7cb6808a
......@@ -600,15 +600,19 @@
//物流
handleWl: function (row) {
this.loading = true;
this.sendGoods.deliverCode = row.DeliverCode;
this.sendGoods.deliverName = row.DeliverName;
this.sendGoods.deliverNo = row.DeliverNo;
this.sendGoods.orderSn = row.order_sn;
getExpressInfo(this.sendGoods).then(response => {
if (response.code == 0) {
getExpressInfo(this.sendGoods).then(res => {
this.loading = false;
if(res.code === 1) {
this.open3 = true;
this.title3 = "物流信息";
this.expressInfo = response.data.data;
this.expressInfo = res.data.data;
}else {
let msg = res.data.reason || res.msg || '数据出错了';
this.$message({type: 'error',message: msg});
}
});
},
......
src/views/system/retreat/address.vue
浏览文件 @ 7cb6808a
......@@ -9,7 +9,6 @@
</el-form>
</div>
<el-table v-loading="loading" :data="addressList">
<el-table-column type="selection" width="45" align="center"/>
<el-table-column label="序号" prop="id" align="center"></el-table-column>
<el-table-column label="售后地址" prop="address" align="center">
<template slot-scope="scope">
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论