code-image-backup-public/lilishop-ui
1
0
Fork 0
mirror of https://gitee.com/beijing_hongye_huicheng/lilishop-ui.git synced 2025-12-21 02:15:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

修改bug，更改字体图标

Browse Source
This commit is contained in:
mabo
2021-05-18 18:03:00 +08:00
parent c3ed622031
commit 6d0e7b3825
45 changed files with 135 additions and 7493 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,9 +17,9 @@
<div class="available-area">
<div class="cart-steps">
<span :class="stepIndex == 0 ? 'active' : ''">1.我的购物车</span>
<Icon :class="stepIndex == 0 ? 'active-arrow' : ''" custom="iconfont icon-xiayibu"></Icon>
<Icon :class="stepIndex == 0 ? 'active-arrow' : ''" custom="icomoon icon-next"></Icon>
<span :class="stepIndex == 1 ? 'active' : ''">2.填写订单信息</span>
<Icon :class="stepIndex == 1 ? 'active-arrow' : ''" custom="iconfont icon-xiayibu"></Icon>
<Icon :class="stepIndex == 1 ? 'active-arrow' : ''" custom="icomoon icon-next"></Icon>
<span :class="stepIndex == 2 ? 'active' : ''">3.成功提交订单</span>
</div>
</div>
@@ -44,7 +44,7 @@
<div>
<Checkbox v-model="shop.checked" @on-change="changeChecked(shop.checked, 'shop', shop.storeId)"></Checkbox>
<span class="go-shop-page" @click="goShopPage(shop.storeId)">{{shop.storeName}}</span>
<Icon class="customer-service" custom="iconfont icon-kefu" />
<Icon class="customer-service" custom="icomoon icon-customer-service" />
</div>
<span class="shop-coupon" v-if="shop.couponList.length" :class="couponAvailable === index ? 'shop-coupon-show' : ''" @click.stop="showCoupon(shop.id, index)">
<!-- 优惠券模态框 -->

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

@@ -112,10 +112,8 @@
<span @click="$router.push('forgetPassword')">忘记密码</span>
</div>
<div class="other-login">
<Icon custom="iconfont icon-qq" color="" class="icon-hover" @click="handleWebLogin('QQ')"/>
<Icon custom="iconfont icon-weixin" color="" class="icon-hover" @click="handleWebLogin('WECHAT_PC')"/>
<!-- <Icon custom="iconfont icon-zhifubao" color="" class="icon-hover" @click="handleWebLogin('ALIPAY')"/> -->
<!-- <Icon custom="iconfont icon-weibo" color="" class="icon-hover" @click="handleWebLogin('WEIBO')"/> -->
<Icon custom="icomoon icon-qq" color="" class="icon-hover" @click="handleWebLogin('QQ')"/>
<Icon custom="icomoon icon-wechat" color="" class="icon-hover" @click="handleWebLogin('WECHAT_PC')"/>
</div>
</div>
<!-- 拼图验证码 -->

8
buyer/src/pages/home/MyShoppingCart.vue
View File

@@ -1,6 +1,10 @@
<template>
<div>
<Table border ref="selection" :columns="columns" :data="shoppingCart" size="large" no-data-text="您的购物车没有商品，请先添加商品到购物车再点击购买"></Table>
<Table border ref="selection" :columns="columns" :data="shoppingCart" size="large" no-data-text="您的购物车没有商品，请先添加商品到购物车再点击购买">
<template slot-scope="{row}" slot="price">
<span>{{row.price | unitPrice('￥')}}</span>
</template>
</Table>
<div class="go-to">
<Button @click="goTo" type="primary">去付款</Button>
</div>
@@ -55,7 +59,7 @@ export default {
{
title: '价格',
width: 68,
key: 'price',
slot: 'price',
align: 'center'
}
]

2
buyer/src/pages/home/memberCenter/Favorites.vue
View File

@@ -15,7 +15,7 @@
{{params.type === 'GOODS'? item.goodsName : item.storeName}}
</div>
<div class="goodsPrice">
<span v-if="params.type === 'GOODS'">{{item.price | unitPrice}}</span>
<span v-if="params.type === 'GOODS'">{{item.price | unitPrice('￥')}}</span>
<Tag color="error" v-if="item.selfOperated">商家自营</Tag>
</div>
<div class="goodsBuy">

2
buyer/src/pages/home/orderCenter/MyOrder.vue
View File

@@ -64,7 +64,7 @@
<div>
<span @click="shopPage(order.storeId)">{{ order.storeName }}</span
>&nbsp;<Icon custom="iconfont icon-kefu" />
>&nbsp;<Icon custom="icomoon icon-customer-service" />
</div>
<div>
<!-- 订单基础操作 -->

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

@@ -39,7 +39,7 @@
<!-- 订单商品 -->
<div class="goods">
<div class="shop-name">
<span @click="shopPage(order.order.storeId)">{{ order.order.storeName }}</span> &nbsp; <Icon custom="iconfont icon-kefu" />
<span @click="shopPage(order.order.storeId)">{{ order.order.storeName }}</span> &nbsp; <Icon custom="icomoon icon-customer-service" />
</div>
<table>
<thead>
@@ -64,9 +64,9 @@
</div>
</td>
<td>{{ goods.id }}</td>
<td>{{ goods.goodsPrice | unitPrice }}</td>
<td>{{ goods.goodsPrice | unitPrice('￥') }}</td>
<td>{{ goods.num }}</td>
<td>{{ (goods.goodsPrice * goods.num) | unitPrice }}</td>
<td>{{ (goods.goodsPrice * goods.num) | unitPrice('￥') }}</td>
</tr>
</tbody>
</table>

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

@@ -9,9 +9,9 @@
</div>
<div class="cart-steps">
<span :class="stepIndex==1?'active':''">1.我的购物车</span>
<Icon :class="stepIndex==1?'active-arrow':''" custom="iconfont icon-xiayibu"></Icon>
<Icon :class="stepIndex==1?'active-arrow':''" custom="icomoon icon-next"></Icon>
<span :class="stepIndex==1?'active':''">2.填写订单信息</span>
<Icon :class="stepIndex==1?'active-arrow':''" custom="iconfont icon-xiayibu"></Icon>
<Icon :class="stepIndex==1?'active-arrow':''" custom="icomoon icon-next"></Icon>
<span :class="stepIndex==2?'active':''">3.成功提交订单</span>
</div>
</div>
@@ -62,8 +62,8 @@
<div class="goods-msg" v-for="(shop,shopIndex) in goodsList" :key="shopIndex">
<div class="shop-name">
<span>
<span class="hover-color" @click="goShopPage(shop.storeId)">{{shop.storeName}}</span>&nbsp;&nbsp;
<Icon class="hover-color" custom="iconfont icon-kefu" />
<span class="hover-color" @click="goShopPage(shop.storeId)">{{shop.storeName}}</span>&nbsp;&nbsp;
<Icon class="hover-color" custom="icomoon icon-customer-service" />
</span>
<span>
<p style="width:120px">配送方式：</p>
@@ -386,13 +386,17 @@ export default {
})
}
})
if (!params.remark.length) delete params.remark;
this.$Spin.show();
createTrade(params).then(res => {
this.$Spin.hide();
if (res.success) {
this.$router.push({path: '/payment', query: {orderType: 'TRADE', sn: res.result.sn}});
}
}).catch(() => {
this.$Spin.hide()
});
},
useScope (type) {

26
buyer/src/pages/shopEntry/first-apply.vue
View File

@@ -9,18 +9,18 @@
placeholder="请填写公司信息"
/>
</FormItem>
<FormItem prop="addressIdPath" label="公司所在地">
<!-- <Input type="text" v-model="form.addressIdPath" placeholder="请选择公司所在地" /> -->
<FormItem prop="storeAddressIdPath" label="公司所在地">
<!-- <Input type="text" v-model="form.storeAddressIdPath" placeholder="请选择公司所在地" /> -->
<region
style="width: 250px"
@selected="selectedRegion"
:addressId="address"
/>
</FormItem>
<FormItem prop="companyAddress" label="公司详细地址">
<FormItem prop="storeAddressDetail" label="公司详细地址">
<Input
type="text"
v-model="form.companyAddress"
v-model="form.storeAddressDetail"
placeholder="请填写公司详细信息"
/>
</FormItem>
@@ -211,8 +211,8 @@ export default {
},
rules: { // 验证规则
companyName: [{ required: true, message: '请填写公司信息' }],
addressIdPath: [{ required: true, message: '请选择公司所在地' }],
companyAddress: [{ required: true, message: '请填写公司详细地址' }],
storeAddressIdPath: [{ required: true, message: '请选择公司所在地' }],
storeAddressDetail: [{ required: true, message: '请填写公司详细地址' }],
employeeNum: [
{ required: true, message: '请填写公司员工总数' },
{ pattern: RegExp.integer, message: '只能填写正整数' }
@@ -270,18 +270,26 @@ export default {
},
selectedRegion (item) {
// 地址选择回显
this.$set(this.form, 'addressIdPath', item[0].toString());
this.$set(this.form, 'storeAddressIdPath', item[0].toString());
this.$set(
this.form,
'addressPath',
'companyAddressPath',
item[1].toString().replace(/\s/g, '')
);
},
beforeUpload () {
this.uploadLoading = true;
if (this.form.licencePhoto.length >= 3) {
this.$Message.warning('最多上传三张图片')
return false;
}
},
beforeUpload1 () {
this.uploadLoading1 = true;
if (this.form.legalPhoto.length >= 3) {
this.$Message.warning('最多上传三张图片')
return false;
}
},
handleSuccess (res, file) {
this.uploadLoading = false;
@@ -328,7 +336,7 @@ export default {
if (this.form.licencePhoto) {
this.form.legalPhoto = this.content.legalPhoto.split(',');
this.form.licencePhoto = this.content.licencePhoto.split(',');
this.address = this.form.addressIdPath;
this.address = this.form.storeAddressIdPath;
}
}
}

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

@@ -28,13 +28,13 @@
></third-apply>
<div class="success-page" v-if="currentIndex == 3">
<span v-if="storeDisable == '' || storeDisable == 'APPLYING'"
>入驻申请提交成功，等待平台审核</span
>
<span v-if="storeDisable == '' || storeDisable == 'APPLYING'">入驻申请提交成功，等待平台审核</span>
<span v-if="storeDisable == 'OPEN'">申请已通过，请联系管理员</span>
<span v-if="storeDisable == 'CLOSED'">店铺已关闭，重申请联系管理员</span>
<span v-if="storeDisable == 'REFUSED'">审核未通过,请修改资质信息，如有疑问请联系管理员</span>
</div>
<Button v-if="currentIndex == 3" @click="$router.push('/')">返回</Button>
<Button v-if="currentIndex === 3" @click="$router.push('/')">返回</Button>
<Button type="primary" @click='currentIndex = 0' v-if="storeDisable === 'REFUSED' && currentIndex === 3">重新申请</Button>
</div>
<Modal

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

@@ -145,6 +145,7 @@ export default {
.then((res) => {
this.loading = false;
if (res.success) this.$emit('change', 3);
this.$parent.getData()
})
.catch(() => {
this.loading = false;
@@ -156,6 +157,10 @@ export default {
},
beforeUpload () {
this.uploadLoading = true;
if (this.form.storeLogo.length >= 3) {
this.$Message.warning('最多上传三张图片')
return false;
}
},
handleSuccess (res, file) {