zhuce
/
lilishop-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui

master
Chopper 2021-05-17 17:42:56 +08:00
parent a3953b9ab5 da5cc8335f
commit 3d1391e305
58 changed files with 161 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
buyer/src/components/addressManage/index.vue
View File

@ -99,7 +99,7 @@ export default {
if (this.id) {
editMemberAddress(params).then((res) => {
this.loading = false;
if (res.code === 200) {
if (res.success) {
this.$Message.success('编辑地址成功');
this.$emit('change', true);
this.hide();
@ -108,7 +108,7 @@ export default {
} else {
newMemberAddress(params).then((res) => {
this.loading = false;
if (res.code === 200) {
if (res.success) {
this.$Message.success('新增地址成功');
this.$emit('change', true);
this.hide();
@ -121,7 +121,7 @@ export default {
getAddrById (id) {
// 获取地址详情
getAddrDetail(id).then((res) => {
if (res.code === 200) {
if (res.success) {
console.log(res);
const data = res.result;
data.address = res.result.consigneeAddressPath.replace(/,/g, ' ');
@ -131,7 +131,6 @@ export default {
},
getAddress (item) {
// 获取地图选择信息
console.log(item);
this.mapMsg = item;
this.$set(this.formData, 'address', item.addr);
this.$set(this.formData, 'consigneeAddressIdPath', item.addrId);

4
buyer/src/components/drawer/Drawer.vue
View File

@ -164,7 +164,7 @@ export default {
// 删除商品
delGoods (id) {
delCartGoods({ skuIds: id }).then((res) => {
if (res.code === 200) {
if (res.success) {
this.$Message.success('删除成功');
this.getCartList();
cartCount().then(res => {
@ -231,7 +231,7 @@ export default {
this.loading = true;
addCartGoods(params).then(res => {
this.loading = false;
if (res.code === 200) {
if (res.success) {
this.$Message.success('商品已成功添加到购物车')
} else {
this.$Message.warning(res.message);

4
buyer/src/components/goodsDetail/ShowGoods.vue
View File

@ -224,7 +224,7 @@ export default {
this.loading = true;
addCartGoods(params).then(res => {
this.loading = false;
if (res.code === 200) {
if (res.success) {
this.$router.push({path: '/shoppingCart', query: {detail: this.skuDetail, count: this.count}});
} else {
this.$Message.warning(res.message);
@ -240,7 +240,7 @@ export default {
this.loading1 = true;
addCartGoods(params).then(res => {
this.loading1 = false;
if (res.code === 200) {
if (res.success) {
this.$router.push({path: '/pay', query: {way: 'BUY_NOW'}});
} else {
this.$Message.warning(res.message);

4
buyer/src/components/goodsDetail/ShowGoodsDetail.vue
View File

@ -144,13 +144,13 @@ export default {
getList () { // 获取评论列表
this.commentParams.goodsId = this.skuDetail.goodsId;
goodsComment(this.commentParams).then(res => {
if (res.code === 200) {
if (res.success) {
this.commentList = res.result.records;
this.commentTotal = res.result.total;
}
});
goodsCommentNum(this.skuDetail.goodsId).then(res => {
if (res.code === 200) {
if (res.success) {
this.commentTypeNum = res.result;
}
});

2
buyer/src/components/map/index.vue
View File

@ -72,7 +72,7 @@ export default {
if (this.useApi) {
handleRegion(params).then((res) => {
this.loading = false;
if (res.code === 200) {
if (res.success) {
this.showMap = false;
this.addrContent.addr = res.result.name.replace(/,/g, ' ');
this.addrContent.addrId = res.result.id;

2
buyer/src/components/nav/GoodsClassNav.vue
View File

@ -358,7 +358,7 @@ export default {
getFilterList (params) {
// 筛选、分类 列表
APIGoods.filterList(params).then((res) => {
if (res.code === 200) {
if (res.success) {
const data = res.result;
this.tagsContent = [{
key: '品牌',

10
buyer/src/pages/Cart.vue
View File

@ -221,7 +221,7 @@ export default {
content: '<p>确定要删除该商品吗？</p>',
onOk: () => {
APICart.delCartGoods({ skuIds: idArr.toString() }).then((res) => {
if (res.code === 200) {
if (res.success) {
this.$Message.success('删除成功');
this.getCartList();
} else {
@ -237,7 +237,7 @@ export default {
content: '<p>确定要清空购物车吗？清空后不可恢复</p>',
onOk: () => {
APICart.clearCart().then((res) => {
if (res.code === 200) {
if (res.success) {
this.$Message.success('清空购物车成功');
this.getCartList();
} else {
@ -264,7 +264,7 @@ export default {
console.log(val, id);
APICart.setCartGoodsNum({ skuId: id, num: val }).then((res) => {
console.log(res);
if (res.code === 200) {
if (res.success) {
this.getCartList();
}
});
@ -288,7 +288,7 @@ export default {
async receiveShopCoupon (item) { // 领取优惠券
let res = await APIMember.receiveCoupon(item.id)
if (res.code === 200) {
if (res.success) {
this.$set(item, 'disabled', true)
this.$Message.success('领取成功')
} else {
@ -301,7 +301,7 @@ export default {
try {
let res = await APICart.cartGoodsAll();
this.loading = false;
if (res.code === 200) {
if (res.success) {
this.cartList = res.result.cartList;
this.priceDetailDTO = res.result.priceDetailDTO;
this.skuList = res.result.skuList;

2
buyer/src/pages/GoodsDetail.vue
View File

@ -70,7 +70,7 @@ export default {
const params = this.$route.query
goodsSkuDetail(params).then((res) => {
this.isLoading = false;
if (res.code === 200) {
if (res.success) {
const result = res.result;
const cateName = res.result.categoryName;
const cateId = result.data.categoryPath.split(',');

2
buyer/src/pages/GoodsList.vue
View File

@ -170,7 +170,7 @@ export default {
apiGoods.goodsList(this.params)
.then((res) => {
this.loading = false;
if (res.code === 200) {
if (res.success) {
this.goodsList = res.result.content;
this.total = res.result.totalElements;
}

17
buyer/src/pages/Login.vue
View File

@ -185,7 +185,7 @@ export default {
code: [{ required: true, message: '请输入手机验证码' }]
},
codeMsg: '发送验证码', // 验证码文字
interval: '', // 定时器
interval: null, // 定时器
time: 60, // 倒计时
logoImg: '' // logo图片
};
@ -201,12 +201,12 @@ export default {
let data = JSON.parse(JSON.stringify(this.formSms));
apiLogin.smsLogin(data).then((res) => {
this.$refs.verify.show = false;
if (res.code === 200) {
if (res.success) {
this.$Message.success('登录成功');
storage.setItem('accessToken', res.result.accessToken);
storage.setItem('refreshToken', res.result.refreshToken);
apiLogin.getMemberMsg().then((res) => {
if (res.code === 200) {
if (res.success) {
storage.setItem('userInfo', res.result);
let query = this.$route.query;
if (query.rePath) {
@ -241,11 +241,10 @@ export default {
verificationEnums: 'LOGIN'
};
sendSms(params).then(res => {
if (res.code === 200) {
if (res.success) {
this.$Message.success('验证码发送成功');
let that = this;
this.interval = setInterval(() => {
console.log(that.time);
that.time--;
if (that.time === 0) {
that.time = 60;
@ -271,13 +270,13 @@ export default {
this.$refs.verify.show = false;
this.$Spin.show();
apiLogin.login(data).then((res) => {
if (res.code === 200) {
if (res.success) {
this.$Message.success('登录成功');
storage.setItem('accessToken', res.result.accessToken);
storage.setItem('refreshToken', res.result.refreshToken);
apiLogin.getMemberMsg().then((res) => {
this.$Spin.hide();
if (res.code === 200) {
if (res.success) {
storage.setItem('userInfo', res.result);
let query = this.$route.query;
if (query.rePath) {
@ -313,12 +312,12 @@ export default {
if (uuid) {
storage.setItem('uuid', uuid);
loginCallback(uuid).then(res => {
if (res.code === 200) {
if (res.success) {
const result = res.result;
storage.setItem('accessToken', result.accessToken);
storage.setItem('refreshToken', result.refreshToken);
apiLogin.getMemberMsg().then((res) => {
if (res.code === 200) {
if (res.success) {
storage.setItem('userInfo', res.result);
let query = this.$route.query;
if (query.rePath) {

2
buyer/src/pages/Merchant.vue
View File

@ -120,7 +120,7 @@ export default {
},
getGoodsList () { // 商品信息
goodsList(this.params).then((res) => {
if (res.code === 200) {
if (res.success) {
this.goodsList = res.result.content;
this.total = res.result.totalElements;
}

4
buyer/src/pages/SignUp.vue
View File

@ -147,7 +147,7 @@ export default {
let data = JSON.parse(JSON.stringify(this.formRegist));
data.password = md5(data.password);
apiLogin.regist(data).then((res) => {
if (res.code === 200) {
if (res.success) {
this.$Message.success('注册成功!');
this.$router.push('login');
} else {
@ -172,7 +172,7 @@ export default {
verificationEnums: 'REGISTER'
};
sendSms(params).then(res => {
if (res.code === 200) {
if (res.success) {
this.$Message.success('验证码发送成功');
let that = this;
this.interval = setInterval(() => {

6
buyer/src/pages/forgetPassword.vue
View File

@ -160,7 +160,7 @@ export default {
let data = JSON.parse(JSON.stringify(this.formFirst));
apiLogin.validateCode(data).then((res) => {
this.loading = false;
if (res.code === 200) {
if (res.success) {
// this.$Message.success('');
this.step = 1;
} else {
@ -186,7 +186,7 @@ export default {
apiLogin.resetPassword(params).then(res => {
this.loading1 = false;
console.log(res);
if (res.code === 200) {
if (res.success) {
this.$Message.success('修改密码成功');
this.$router.push('login');
}
@ -209,7 +209,7 @@ export default {
verificationEnums: 'FIND_USER'
};
sendSms(params).then(res => {
if (res.code === 200) {
if (res.success) {
this.$Message.success('验证码发送成功');
let that = this;
this.interval = setInterval(() => {

6
buyer/src/pages/home/orderCenter/AddAddress.vue
View File

@ -88,14 +88,14 @@ export default {
this.loading = true;
if (this.$route.query.id) {
editMemberAddress(params).then((res) => {
if (res.code === 200) {
if (res.success) {
this.loading = false;
this.$router.push('/home/MyAddress');
}
}).catch(() => { this.loading = false; });
} else {
newMemberAddress(params).then((res) => {
if (res.code === 200) {
if (res.success) {
this.loading = false;
this.$router.push('/home/MyAddress');
}
@ -107,7 +107,7 @@ export default {
getAddrById (id) {
// 获取地址详情
getAddrDetail(id).then((res) => {
if (res.code === 200) {
if (res.success) {
console.log(res);
const data = res.result;
data.address = res.result.consigneeAddressPath.replace(/,/g, ' ');

4
buyer/src/pages/home/orderCenter/MyAddress.vue
View File

@ -58,7 +58,7 @@ export default {
content: '你确定删除这个收货地址',
onOk: () => {
delMemberAddress(id).then((res) => {
if (res.code === 200) {
if (res.success) {
this.$Message.success('删除成功');
this.getAddrList();
}
@ -73,7 +73,7 @@ export default {
// 获取地址列表
memberAddress().then((res) => {
console.log(res);
if (res.code === 200) {
if (res.success) {
this.list = res.result.records;
}
});

2
buyer/src/pages/payment/Pay.vue
View File

@ -311,7 +311,7 @@ export default {
content: '你确定删除这个收货地址',
onOk: () => {
delMemberAddress(item.id).then((res) => {
if (res.code === 200) {
if (res.success) {
this.$Message.success('删除成功');
this.getAddress();
}

2
buyer/src/pages/shopEntry/shop-entry.vue
View File

@ -34,7 +34,7 @@
<span v-if="storeDisable == 'OPEN'">申请已通过，请联系管理员</span>
<span v-if="storeDisable == 'CLOSED'">店铺已关闭，重申请联系管理员</span>
</div>
<Button v-if="currentIndex == 3" @click="currentIndex = 2">返回</Button>
<Button v-if="currentIndex == 3" @click="$router.push('/')">返回</Button>
</div>
<Modal

2
buyer/src/plugins/request.js
View File

@ -168,7 +168,7 @@ function getTokenDebounce () {
lock = true
let oldRefreshToken = Storage.getItem('refreshToken');
handleRefreshToken(oldRefreshToken).then(res => {
if (res.code === 200) {
if (res.success) {
let {
accessToken,
refreshToken

2
manager/src/libs/axios.js
View File

@ -125,7 +125,7 @@ function getTokenDebounce() {
lock = true
let oldRefreshToken = getStore("refreshToken");
handleRefreshToken(oldRefreshToken).then(res => {
if (res.code === 200) {
if (res.success) {
let {
accessToken,
refreshToken

4
manager/src/styles/common.scss
View File

@ -14,7 +14,9 @@ $theme_color: #804ed1;
border-radius: 1em;
background-color: rgba(50,50,50,.1);
}
.ivu-table table{
width: 100%!important;
}
.flex{
display: flex !important;

6
manager/src/views/lili-floor-renovation/floorList copy.vue
View File

@ -133,7 +133,7 @@ export default {
pageClientType: "PC",
};
API_floor.getHomeList(params).then((res) => {
if (res.code == 200) {
if (res.success) {
this.templateList = res.result.records;
}
});
@ -142,7 +142,7 @@ export default {
releaseTemplate(id) {
//发布模板
API_floor.releasePageHome(id).then((res) => {
if (res.code === 200) {
if (res.success) {
this.$Message.success("发布模板成功");
this.getTemplateList();
}
@ -155,7 +155,7 @@ export default {
content: "<p>确定删除该模板吗？</p>",
onOk: () => {
API_floor.removePageHome(id).then((res) => {
if (res.code === 200) {
if (res.success) {
this.$Message.success("删除模板成功");
this.getTemplateList();
}

6
manager/src/views/lili-floor-renovation/floorList.vue
View File

@ -153,7 +153,7 @@ export default {
pageClientType: "PC",
};
API_floor.getHomeList(params).then((res) => {
if (res.code == 200) {
if (res.success) {
this.list = res.result.records;
this.list.forEach(e => {
if (e.pageShow === 'OPEN') {
@ -169,7 +169,7 @@ export default {
releaseTemplate(id) {
//发布模板
API_floor.releasePageHome(id).then((res) => {
if (res.code === 200) {
if (res.success) {
this.$Message.success("发布模板成功");
this.getTemplateList();
}
@ -178,7 +178,7 @@ export default {
delTemplate(id) {
API_floor.removePageHome(id).then((res) => {
if (res.code === 200) {
if (res.success) {
this.$Message.success("删除模板成功");
this.getTemplateList();
}

4
manager/src/views/lili-floor-renovation/renovation.vue
View File

@ -51,7 +51,7 @@ export default {
pageData:modelForm,
}
API_floor.updateHome(this.$route.query.id, data).then(res=> {
if(res.code === 200) {
if(res.success) {
this.$Message.success('保存模板成功');
} else {
this.$Message.error(res.message)
@ -63,7 +63,7 @@ export default {
},
getTemplateItem(id){ // 获取模板数据
API_floor.getHomeData(id).then(res => {
if (res.code === 200) {
if (res.success) {
let pageData = res.result.pageData;
if(pageData) {
pageData = JSON.parse(pageData);

4
manager/src/views/lili-floor-renovation/wap/navbar.vue
View File

@ -136,7 +136,7 @@ export default {
})
.then((res) => {
this.num = 50;
if (res.code == 200) {
if (res.success) {
this.num = 80;
/**制作保存成功动画¸ */
setTimeout(() => {
@ -166,7 +166,7 @@ export default {
API_Other.setHomeSetup(submitWay)
.then((res) => {
this.num = 50;
if (res.code == 200) {
if (res.success) {
this.num = 80;
/**制作保存成功动画¸ */
setTimeout(() => {

14
manager/src/views/main-components/tags-page-opened.vue
View File

@ -8,20 +8,8 @@
@mousewheel="handlescroll"
class="tags-outer-scroll-con"
>
<!-- <div class="close-all-tag-con">
<Dropdown transfer @on-click="handleTagsOption">
<Button size="small" type="primary">
<Icon type="md-arrow-dropdown"></Icon>
</Button>
<DropdownMenu slot="list">
<DropdownItem name="clearAll">{{ $t('closeAll') }}</DropdownItem>
<DropdownItem name="clearOthers">{{ $t('closeOthers') }}</DropdownItem>
</DropdownMenu>
</Dropdown>
</div> -->
<ul v-show="visible" :style="{left: contextMenuLeft + 'px', top: contextMenuTop + 'px'}" class="contextmenu">
<li v-for="(item, key) of menuList" @click="handleTagsOption(key)" :key="key">{{item}}</li>
<li v-for="(item, key) of actionList" @click="handleTagsOption(key)" :key="key">{{item}}</li>
</ul>
<div ref="scrollBody" class="tags-inner-scroll-body" :style="{left: tagBodyLeft + 'px'}">
<transition-group name="taglist-moving-animation">

2
manager/src/views/member/list/index.vue
View File

@ -430,7 +430,7 @@ export default {
content: "<p>确认禁用此会员？</p>",
onOk: () => {
API_Member.updateMemberStatus(params).then((res) => {
if (res.code === 200) {
if (res.success) {
this.$Message.success("禁用成功");
this.getData();
} else {

4
manager/src/views/member/list/memberRecycle.vue
View File

@ -421,7 +421,7 @@
content: '<p>确认禁用此会员？</p>',
onOk: () => {
API_Member.updateMemberStatus(params).then(res => {
if (res.code === 200) {
if (res.success) {
this.$Message.success('禁用成功');
this.getData()
} else {
@ -446,7 +446,7 @@
content: '<p>启用用此会员？</p>',
onOk: () => {
API_Member.updateMemberStatus(params).then(res => {
if (res.code === 200) {
if (res.success) {
this.$Message.success('禁用成功');
this.getData()
} else {

2
manager/src/views/my-components/map/index.vue
View File

@ -58,7 +58,7 @@ methods: {
townName: this.addrContent.regeocode.addressComponent.township
}
getRegion(params).then(res=>{
if(res.code == 200) {
if(res.success) {
this.addrContent.addr = res.result.name.replace(/,/g," ")
this.addrContent.addrId = res.result.id
this.loading = false

2
manager/src/views/order/order/orderList.vue
View File

@ -254,7 +254,7 @@ export default {
content: "<p>您确定要收款吗？线下收款涉及库存变更，需异步进行，等待约一分钟刷新列表查看</p>",
onOk: () => {
API_Order.orderPay(v.sn).then((res) => {
if (res.code === 200) {
if (res.success) {
this.$Message.success("收款成功");
this.getDataList();
} else {

2
manager/src/views/seller/bill/bill-detail.vue
View File

@ -389,7 +389,7 @@ export default {
pass() {
API_Shop.pay(this.id).then((res) => {
if (res.code == 200) {
if (res.success) {
this.$Message.success(res.message);
this.init();
}

4
manager/src/views/sys/message/sms.vue
View File

@ -761,7 +761,7 @@ export default {
API_Setting.addSmsTemplatePage(this.templateForm)
.then((res) => {
this.loading = false;
if (res.code === 200) {
if (res.success) {
this.$Message.success("添加成功");
this.loading = false;
this.templateModalVisible = false;
@ -775,7 +775,7 @@ export default {
API_Setting.editSmsTemplatePage(this.templateForm)
.then((res) => {
this.loading = false;
if (res.code === 200) {
if (res.success) {
this.$Message.success("修改成功");
this.loading = false;
this.templateModalVisible = false;

6
manager/src/views/sys/message/smsSign.vue
View File

@ -124,7 +124,7 @@
if (this.id == undefined) {
API_Setting.addSmsSign(this.form).then(res => {
this.loading = false;
if (res.code === 200) {
if (res.success) {
this.$Message.success('添加成功');
this.$router.back()
}
@ -134,7 +134,7 @@
} else {
API_Setting.editSmsSign(this.form).then(res => {
this.loading = false;
if (res.code === 200) {
if (res.success) {
this.$Message.success('修改成功');
this.$router.back()
}
@ -150,7 +150,7 @@
getSmsSignDetail() {
API_Setting.smsSignDetail(this.id).then(res => {
this.loading = false;
if (res.code === 200) {
if (res.success) {
this.form = res.result
}
})

2
manager/src/views/sys/setting-manage/authLogin/QQ_CONNECT.vue
View File

@ -84,7 +84,7 @@ export default {
setSetting(this.type, {
qqConnectSettingItemList: this.formValidate,
}).then((res) => {
if (res.code == 200) {
if (res.success) {
this.$Message.success("保存成功!");
this.$Modal.remove();
} else {

2
manager/src/views/sys/setting-manage/authLogin/WECHAT_CONNECT.vue
View File

@ -82,7 +82,7 @@ export default {
setSetting(this.type, {
wechatConnectSettingItems: this.formValidate,
}).then((res) => {
if (res.code == 200) {
if (res.success) {
this.$Message.success("保存成功!");
this.$Modal.remove();
} else {

2
manager/src/views/sys/setting-manage/pay/ALIPAY_PAYMENT.vue
View File

@ -54,7 +54,7 @@ export default {
setupSetting() {
setSetting(this.type, this.formValidate).then((res) => {
if (res.code == 200) {
if (res.success) {
this.$Message.success("保存成功!");
} else {
this.$Message.error("保存失败!");

2
manager/src/views/sys/setting-manage/pay/PAYMENT_SUPPORT.vue
View File

@ -104,7 +104,7 @@ export default {
setupSetting() {
setSetting(this.type, { paymentSupportItems: this.formValidate }).then(
(res) => {
if (res.code == 200) {
if (res.success) {
this.$Message.success("保存成功!");
this.$Modal.remove();
} else {

2
manager/src/views/sys/setting-manage/pay/WECHAT_PAYMENT.vue
View File

@ -60,7 +60,7 @@ export default {
setupSetting() {
setSetting(this.type, this.formValidate).then((res) => {
if (res.code == 200) {
if (res.success) {
this.$Message.success("保存成功!");
} else {
this.$Message.error("保存失败!");

2
manager/src/views/sys/setting-manage/setting/BASE_SETTING.vue
View File

@ -103,7 +103,7 @@ export default {
setupSetting() {
setSetting(this.type, this.formValidate).then((res) => {
if (res.code == 200) {
if (res.success) {
this.$Message.success("保存成功!");
} else {
this.$Message.error("保存失败!");

2
manager/src/views/sys/setting-manage/setting/GOODS_SETTING.vue
View File

@ -99,7 +99,7 @@ export default {
setupSetting() {
setSetting(this.type, this.formValidate).then((res) => {
if (res.code == 200) {
if (res.success) {
this.$Message.success("保存成功!");
} else {
this.$Message.error("保存失败!");

2
manager/src/views/sys/setting-manage/setting/KUAIDI_SETTING.vue
View File

@ -47,7 +47,7 @@ export default {
setupSetting() {
setSetting(this.type, this.formValidate).then((res) => {
if (res.code == 200) {
if (res.success) {
this.$Message.success("保存成功!");
} else {
this.$Message.error("保存失败!");

2
manager/src/views/sys/setting-manage/setting/ORDER_SETTING.vue
View File

@ -71,7 +71,7 @@ export default {
setupSetting() {
setSetting(this.type, this.formValidate).then((res) => {
if (res.code == 200) {
if (res.success) {
this.$Message.success("保存成功!");
} else {
this.$Message.error("保存失败!");

2
manager/src/views/sys/setting-manage/setting/OSS_SETTING.vue
View File

@ -53,7 +53,7 @@ export default {
setupSetting() {
setSetting(this.type, this.formValidate).then((res) => {
if (res.code == 200) {
if (res.success) {
this.$Message.success("保存成功!");
} else {
this.$Message.error("保存失败!");

2
manager/src/views/sys/setting-manage/setting/POINT_SETTING.vue
View File

@ -80,7 +80,7 @@ export default {
setupSetting() {
setSetting(this.type, this.formValidate).then((res) => {
if (res.code == 200) {
if (res.success) {
this.$Message.success("保存成功!");
} else {
this.$Message.error("保存失败!");

2
manager/src/views/sys/setting-manage/setting/SMS_SETTING.vue
View File

@ -50,7 +50,7 @@ export default {
setupSetting() {
setSetting(this.type, this.formValidate).then((res) => {
if (res.code == 200) {
if (res.success) {
this.$Message.success("保存成功!");
} else {
this.$Message.error("保存失败!");

2
manager/src/views/sys/setting-manage/setting/WITHDRAWAL_SETTING.vue
View File

@ -42,7 +42,7 @@ export default {
setupSetting() {
setSetting(this.type, this.formValidate).then((res) => {
if (res.code == 200) {
if (res.success) {
this.$Message.success("保存成功!");
} else {
this.$Message.error("保存失败!");

2
manager/src/views/sys/setting-manage/smsSettingManage.vue
View File

@ -72,7 +72,7 @@
},
saveSetting() {
setSetting("SMS_SETTING", this.form).then((res) => {
if (res.code == 200) {
if (res.success) {
this.$Message.success("保存成功!");
} else {
this.$Message.error("保存失败!");

BIN
seller/src/assets/logo-min.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.5 KiB

2
seller/src/libs/axios.js
View File

@ -124,7 +124,7 @@ function getTokenDebounce() {
lock = true
let oldRefreshToken = getStore("refreshToken");
handleRefreshToken(oldRefreshToken).then(res => {
if (res.code === 200) {
if (res.success) {
let {
accessToken,
refreshToken

4
seller/src/styles/common.scss
View File

@ -14,7 +14,9 @@ $theme_color: #804ed1;
border-radius: 1em;
background-color: rgba(50,50,50,.1);
}
.ivu-table table {
width: 100%!important;
}
.flex{
display: flex !important;

55
seller/src/views/goods/goods-seller/goodsOperation.vue
View File

@ -28,7 +28,7 @@
:key="index"
>
<span>{{ item.name }}</span>
<span>》</span>
<span>&gt;</span>
</li>
</ul>
<ul v-if="categoryListLevel2 && categoryListLevel2.length > 0">
@ -39,7 +39,7 @@
:key="index"
>
<span>{{ item.name }}</span>
<span>》</span>
<span>&gt;</span>
</li>
</ul>
<ul v-if="categoryListLevel3 && categoryListLevel3.length > 0">
@ -701,6 +701,34 @@ export default {
this.activestep = 1;
this.isOperationGoods = false;
this.GET_GoodData();
} else if (to.query.id) {
this.activestep = 1;
this.goodsId = this.$route.query.id;
this.GET_GoodData();
} else {
this.baseInfoForm = {
salesModel: "RETAIL",
goodsParamsList: [],
freightPayer: "BUYER",
weight: "",
goodsGalleryFiles: [],
release: "true",
recommend: "true",
storeCategoryPath: "",
brandId: 0,
goodsUnit: "",
categoryPath: "",
sellingPoint: "",
intro: "",
mobileIntro: "",
updateSku: true,
regeneratorSkuFlag: false,
templateId: 0,
};
this.activestep = 0;
this.isPublish = true;
this.GET_GoodsTemplate();
this.GET_NextLevelCategory();
}
}
},
@ -985,7 +1013,25 @@ export default {
}
//新增商品
else {
this.baseInfoForm = {};
this.baseInfoForm = {
salesModel: "RETAIL",
goodsParamsList: [],
freightPayer: "BUYER",
weight: "",
goodsGalleryFiles: [],
release: "true",
recommend: "true",
storeCategoryPath: "",
brandId: 0,
goodsUnit: "",
categoryPath: "",
sellingPoint: "",
intro: "",
mobileIntro: "",
updateSku: true,
regeneratorSkuFlag: false,
templateId: 0,
};
this.activestep = 0;
this.isPublish = true;
this.GET_GoodsTemplate();
@ -1088,6 +1134,7 @@ export default {
});
},
handleBeforeUploadGoodsPicture() {
console.log(this.baseInfoForm);
const check = this.baseInfoForm.goodsGalleryFiles.length < 5;
if (!check) {
this.$Notice.warning({
@ -1198,6 +1245,7 @@ export default {
...this.baseInfoForm,
...response.result,
};
console.warn(this.baseInfoForm);
if (this.baseInfoForm.freightPayer != "BUYER") {
API_Shop.getShipTemplate().then((res) => {
if (res.success) {
@ -1702,6 +1750,7 @@ export default {
this.GET_GoodData();
return;
}
console.log(this.baseInfoForm);
this.GET_GoodsParams();
/** 1级校验 */
this.loading = true;

2
seller/src/views/main.scss
View File

@ -258,7 +258,7 @@
top: 100px;
right: 0;
bottom: 0;
height: calc(100% + 52px);
height: calc(100% + 200px);
width: calc(100% - 240px);
background-color: #f0f0f0;

2
seller/src/views/my-components/map/index.vue
View File

@ -58,7 +58,7 @@ methods: {
townName: this.addrContent.regeocode.addressComponent.township
}
getRegion(params).then(res=>{
if(res.code == 200) {
if(res.success) {
this.addrContent.addr = res.result.name.replace(/,/g," ")
this.addrContent.addrId = res.result.id
this.loading = false

31
seller/src/views/promotion/pintuan/pintuanGoods.vue
View File

@ -19,11 +19,14 @@
<Row class="operation">
<Table :loading="loading" border :columns="goodsColumns" :data="goodsData" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
<template slot-scope="{ row, index }" slot="price">
<Input v-model="row.price" @input="goodsData[index].price = row.price" />
<Input v-model="row.price" :disabled="status==='view'" @input="goodsData[index].price = row.price" />
</template>
<template slot-scope="{ row }" slot="QRCode">
<img :src="row.QRCode || '../../../assets/lili.png'" width="50px" height="50px" alt="" />
</template>
<template slot-scope="{ index }" slot="action">
<Button type="error" size="small" ghost v-if="status === 'manager'" @click="delGoods(index)">删除</Button>
</template>
</Table>
</Row>
<Row type="flex" justify="end" class="page operation">
@ -138,27 +141,9 @@ export default {
{
title: "操作",
key: "action",
slot: "action",
minWidth: 50,
align: "center",
render: (h, params) => {
return h(
"Button",
{
props: {
size: "small",
type: "error",
ghost: true,
},
on: {
click: () => {
this.delGoods(params.index);
},
},
},
"删除"
);
},
},
],
goodsData: [], // 商品列表
@ -327,9 +312,9 @@ export default {
margin: 20px 0;
font-size: 15px;
&::before{
content: '';
border: 1px solid $theme_color;
height: 10px;
content: '|';
color: $theme_color;
display: inline-block;
font-weight: bold;
font-size: 16px;
margin-right: 5px;

11
seller/src/views/promotion/seckill/seckill.vue
View File

@ -64,14 +64,19 @@
</template>
<template slot-scope="{ row }" slot="action">
<Button
v-if="
row.promotionStatus === 'NEW'
"
v-if="row.promotionStatus === 'NEW'"
type="primary"
size="small"
@click="manage(row)"
>管理</Button
>
<Button
v-else
type="info"
size="small"
@click="manage(row)"
>查看</Button
>
</template>
</Table>
</Row>

7
seller/src/views/promotion/seckill/seckillGoods.vue
View File

@ -16,7 +16,7 @@
<Button @click="delAll">批量删除</Button>
</template>
</Row>
<Row v-show="openTip">
<Row v-show="openTip" v-if="promotionStatus == 'NEW'">
<Alert show-icon>
已选择 <span class="select-count">{{ selectCount }}</span> 项
</Alert>
@ -101,8 +101,7 @@
<template slot-scope="{ row, index }" slot="action">
<Button
type="error"
v-if="row.promotionApplyStatus !== 'PASS'"
:disabled="promotionStatus != 'NEW'"
v-if="promotionStatus === 'NEW'"
size="small"
ghost
@click="delGoods(index, row.id)"
@ -119,7 +118,7 @@
<Button
type="primary"
:loading="submitLoading"
:disabled="promotionStatus != 'NEW'"
v-if="promotionStatus === 'NEW'"
@click="save"
>提交</Button
>

2
seller/src/views/shop/bill/billDetail.vue
View File

@ -478,7 +478,7 @@ export default {
onOk: () => {
API_Shop.reconciliation(this.id).then((res) => {
this.$Modal.remove();
if (res.code == 200) {
if (res.success) {
this.$Message.success("账单核对成功");
this.init();
}

4
seller/src/views/shop/ship/logistics.vue
View File

@ -165,7 +165,7 @@
onOk: () => {
API_Shop.logisticsChecked(v.id).then((res) => {
this.$Modal.remove();
if (res.code == 200) {
if (res.success) {
this.$Message.success("物流公司开启成功");
this.init();
}
@ -183,7 +183,7 @@
onOk: () => {
API_Shop.logisticsUnChecked(v.selected).then((res) => {
this.$Modal.remove();
if (res.code == 200) {
if (res.success) {
this.$Message.success("物流公司关闭成功");
this.init();
}

2
seller/src/views/shop/shopAddress.vue
View File

@ -320,7 +320,7 @@
onOk: () => {
API_Shop.deleteShopAddress(v.id).then((res) => {
this.$Modal.remove();
if (res.code == 200) {
if (res.success) {
this.$Message.success("此自自提地址已删除");
this.init();
}