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

合并Master

master
lemon橪 2021-06-28 18:17:19 +08:00
parent 3e54f24ddd cb14b13c19
commit 78dc8a5e0b
12 changed files with 75 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
buyer/src/config/index.js
View File

@ -17,15 +17,15 @@ export default {
* @description api请求基础路径
*/
api_dev: {
// common: 'http://192.168.0.109:8890',
// buyer: 'http://192.168.0.109:8888',
// seller: 'http://192.168.0.109:8889',
// manager: 'http://192.168.0.109:8887'
common: 'http://192.168.0.100:8890',
buyer: 'http://192.168.0.100:8888',
seller: 'http://192.168.0.100:8889',
manager: 'http://192.168.0.100:8887'
common: 'https://common-api.pickmall.cn',
buyer: 'https://buyer-api.pickmall.cn',
seller: 'https://store-api.pickmall.cn',
manager: 'https://admin-api.pickmall.cn'
// common: 'https://common-api.pickmall.cn',
// buyer: 'https://buyer-api.pickmall.cn',
// seller: 'https://store-api.pickmall.cn',
// manager: 'https://admin-api.pickmall.cn'
},
api_prod: {
common: 'https://common-api.pickmall.cn',

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

@ -9,10 +9,12 @@
<img :src="storeMsg.storeLogo" height="50" alt="">
<div>
<p>{{storeMsg.storeName || 'xx店铺'}}</p>
<p v-html="storeMsg.storeDesc"></p>
<p class="ellipsis" :alt="storeMsg.storeDesc" v-html="storeMsg.storeDesc"></p>
</div>
<div>
<span class="hover-pointer" @click="collect"><Icon type="ios-heart" :color="storeCollected ? '#ed3f14' : '#fff'" />{{storeCollected?'已收藏店铺':'收藏店铺'}}</span>
<span style="width:80px" class="hover-pointer ml_10" @click="connectCs(storeMsg.yzfSign)"><Icon custom="icomoon icon-customer-service" />联系客服</span>
</div>
<div class="store-collect" @click="collect"><Icon type="ios-heart" :color="storeCollected ? '#ed3f14' : '#fff'" />{{storeCollected?'已收藏店铺':'收藏店铺'}}</div>
<span class="hover-pointer ml_10" @click="connectCs(storeMsg.yzfSign)"><Icon custom="icomoon icon-customer-service" />联系客服</span>
</div>
</div>
<div class="store-category">
@ -183,15 +185,25 @@ export default {
position: relative;
width: 100%;
background-color: #666;
padding: 10px;
padding: 4px;
color: #fff;
>div{
display: flex;
width: 1200px;
margin: 0 auto;
align-items: center;
>div{
img {
width: 80px;
}
>div:nth-child(2){
margin-left: 10px;
flex: 1;
}
>div:nth-child(3){
width: 200px;
}
}
img {
@ -202,14 +214,11 @@ export default {
}
p:nth-child(2){
font-size: 14px;
max-height: 40px;
max-width: 400px;
}
}
.store-collect{
margin-left: 750px!important;
&:hover{
cursor: pointer;
}
}
.store-category {
background-color: #005aa0;
color: #fff;

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

@ -1,14 +1,13 @@
<template>
<div class="login">
<div style="height:50px;"></div>
<!-- 顶部logo -->
<div class="top-content">
<div class="logo-box">
<img
src="../assets/images/logo1.png"
@click="$router.push('/')"
/>
<div>修改密码</div>
</div>
<div class="logo-box">
<img
:src="logoImg" width='150'
@click="$router.push('/')"
/>
<div>修改密码</div>
</div>
<div class="login-container">
<!-- 验证手机号 -->
@ -119,6 +118,7 @@ export default {
components: { Verify },
data () {
return {
logoImg: '', // logo图
loading: false, // 加载状态
loading1: false, // 第二步加载状态
formFirst: { // 手机验证码表单
@ -242,34 +242,22 @@ export default {
},
mounted () {
this.$refs.formFirst.resetFields();
this.logoImg = this.Cookies.getItem('logo')
},
watch: {
}
};
</script>
<style scoped lang="scss">
.login {
height: 100%;
}
.top-content {
width: 100%;
.logo-box {
width: 600px;
height: 80px;
position: relative;
z-index: 1;
box-shadow: 0 1px 1px #ddd;
background-color: #fff;
.logo-box {
width: 80%;
max-width: 1200px;
height: 80px;
margin: 0 auto;
display: flex;
align-items: center;
img {
width: 200px;
cursor: pointer;
}
margin: 0 auto;
display: flex;
align-items: center;
img {
width: 150px;
cursor: pointer;
}
div {
font-size: 20px;
@ -278,22 +266,23 @@ export default {
}
.login-container {
border-top: 2px solid $theme_color;
position: relative;
margin: 10px auto;
margin: 0 auto;
width: 600px;
background-color: #fff;
padding: 20px;
padding: 20px 150px;
.login-btn{
position: absolute;
right: 20px;
top: 20px;
top: -45px;
}
}
.verify-con{
position: absolute;
left: 400px;
top: 50px;
left: 140px;
top: -30px;
z-index: 10;
}

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

@ -63,6 +63,7 @@ export default {
this.num++;
if (this.num >= 7) {
clearInterval(this.interval);
this.interval = null;
}
let params = JSON.parse(JSON.stringify(this.$route.query));
delete params.paymentMethod;
@ -70,6 +71,7 @@ export default {
payCallback(params).then(res => {
if (res.result) {
clearInterval(this.interval);
this.interval = null;
this.$router.push({path: '/payDone', query: {orderType: this.$route.query.orderType}});
}
});

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

@ -21,9 +21,6 @@
<span v-if="storeDisable == 'CLOSED'">店铺已关闭，重申请联系管理员</span>
<span v-if="storeDisable == 'REFUSED'">审核未通过,请修改资质信息，如有疑问请联系管理员</span>
</div>
<Button @click="currentIndex = 0">上一步</Button>
<Button @click="currentIndex = 1">下一步</Button>
<Button @click="currentIndex = 2">第三步</Button>
<Button v-if="currentIndex === 3" @click="$router.push('/')">返回</Button>
<Button type="primary" @click='currentIndex = 0' v-if="storeDisable === 'REFUSED' && currentIndex === 3">重新申请</Button>
</div>

1
buyer/src/pages/shopEntry/third-apply.vue
View File

@ -90,7 +90,6 @@
</FormItem>
<FormItem>
<Button @click="$emit('change', 1)">返回</Button>
<Button type="primary" :loading="loading" @click="next"
>提交平台审核</Button

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

@ -116,6 +116,7 @@ async function refresh (error) {
});
},
onCancel: () => {
router.go(0)
Modal.remove();
}
});

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

@ -324,7 +324,7 @@ export default {
// 已选择用户数据
selectedList: {
type: null,
default: "",
default: [],
},
},
watch: {

4
manager/src/views/seller/shop/shopDetail.vue
View File

@ -98,8 +98,8 @@
</p>
<p class="item">
<span class="label">店铺经纬度：</span>
<span class="info">{{storeInfo.storeCenter?storeInfo.storeCenter:'暂未完善'}}</span>
<span class="label">店铺定位：</span>
<span class="info">{{storeInfo.storeCenter?'已定位':'未定位'}}</span>
</p>
<p class="item">
<span class="label">经营范围：</span>

16
manager/src/views/seller/shop/shopOperation.vue
View File

@ -27,8 +27,18 @@
</RadioGroup>
</FormItem>
<FormItem label="店铺经纬度" prop="shopCenter">
<Input v-model="shopForm.storeCenter" @on-focus="$refs.liliMap.showMap = true" clearable style="width: 350px" />
<FormItem label="店铺定位" prop="shopCenter">
<!-- <Input v-model="shopForm.storeCenter" @on-focus="$refs.liliMap.showMap = true" clearable style="width: 350px" /> -->
<Button
type="info"
v-if="!shopForm.storeCenter"
@click="$refs.liliMap.showMap = true"
>点击获取店铺定位</Button>
<Button
type="success"
v-else
@click="$refs.liliMap.showMap = true"
>已定位</Button>
</FormItem>
<FormItem label="店铺所在地" prop="storeAddressPath">
@ -267,7 +277,7 @@ export default {
{ required: true, message: "店铺简介不能为空", trigger: "blur" },
],
storeCenter: [
{ required: true, message: "店铺经纬度不能为空", trigger: "change" },
{ required: true, message: "店铺未定位", trigger: "change" },
],
companyName: [
{ required: true, message: "公司名称不能为空", trigger: "blur" },

2
seller/src/views/goods/goods-seller/goods.vue
View File

@ -36,7 +36,7 @@
<DropdownItem name="uppers">批量上架</DropdownItem>
<DropdownItem name="lowers">批量下架</DropdownItem>
<DropdownItem name="deleteAll">批量删除</DropdownItem>
<!-- <DropdownItem name="batchShipTemplate">批量设置运费模板</DropdownItem> -->
<DropdownItem name="batchShipTemplate">批量设置运费模板</DropdownItem>
</DropdownMenu>
</Dropdown>
</Row>

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

@ -621,7 +621,7 @@ export default {
/** 是否重新生成sku */
regeneratorSkuFlag: false,
/** 运费模板id **/
templateId: 0,
templateId: '',
/** 参数组*/
goodsParamsDTOList: [],
},
@ -685,6 +685,7 @@ export default {
{required: true, message: "请输入物流参数"},
{validator: checkWeight},
],
templateId: [{required: true, message: '请选择物流模板'}],
sellingPoint: [{required: true, message: "请输入商品卖点"}],
goodsUnit: [{required: true, message: "请选择计量单位"}],
},
@ -763,7 +764,7 @@ export default {
mobileIntro: "",
updateSku: true,
regeneratorSkuFlag: false,
templateId: 0,
templateId: '',
goodsParamsDTOList: [],
};
this.activestep = 0;
@ -1548,6 +1549,7 @@ export default {
this.$Message.error("请上传商品图片");
return;
}
if (this.baseInfoForm.templateId === '') this.baseInfoForm.templateId = 0;
let flag = false;
let paramValue = "";
// //参数校验