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

修改bug，商家端添加商品，选择运费模板

master
mabo 2021-05-19 14:10:05 +08:00
parent 95d0d4032f
commit 030adb7ae6
9 changed files with 34 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -153,7 +153,7 @@ export default {
if (v) { if (v) {
this.getAddrById(v); this.getAddrById(v);
} else { } else {
this.formData = {} this.formData = {isDefault: false}
this.$refs.form.resetFields(); this.$refs.form.resetFields();
} }
} }

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

@ -269,11 +269,12 @@ export default {
}); });
}, },
selectedRegion (item) { selectedRegion (item) {
console.log(item);
// 地址选择回显 // 地址选择回显
this.$set(this.form, 'storeAddressIdPath', item[0].toString()); this.$set(this.form, 'storeAddressIdPath', item[0].toString());
this.$set( this.$set(
this.form, this.form,
'companyAddressPath', 'storeAddressPath',
item[1].toString().replace(/\s/g, '') item[1].toString().replace(/\s/g, '')
); );
}, },

2
manager/src/views/login.vue
View File

@ -27,7 +27,7 @@
</div> </div>
<Footer /> <Footer />
</Col> </Col>
<LangSwitch /> <!-- <LangSwitch /> -->
</Row> </Row>
</div> </div>
</template> </template>

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

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

2
seller/src/main.js
View File

@ -6,6 +6,7 @@ import "./styles/theme.less";
import "core-js/stable"; import "core-js/stable";
import "regenerator-runtime/runtime"; import "regenerator-runtime/runtime";
import vueQr from 'vue-qr'
import App from "./App"; import App from "./App";
import { router } from "./router/index"; import { router } from "./router/index";
@ -42,6 +43,7 @@ Vue.use(ViewUI, {
}); });
Vue.use(VueClipboard); Vue.use(VueClipboard);
Vue.component(vueQr)
// 挂载全局使用的方法 // 挂载全局使用的方法
Vue.prototype.getRequest = getRequest; Vue.prototype.getRequest = getRequest;

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

@ -88,6 +88,9 @@ ul,li{
text-overflow:ellipsis; text-overflow:ellipsis;
white-space: nowrap; white-space: nowrap;
} }
.hover-pointer {
cursor: pointer;
}
/* /*
* @Author: LMR * @Author: LMR

14
seller/src/views/distribution/distributionGoods.vue
View File

@ -23,16 +23,22 @@
<Row> <Row>
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"> <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
<!-- 商品栏目格式化 --> <!-- 商品栏目格式化 -->
<template slot="goodsSlot" slot-scope="scope"> <template slot="goodsSlot" slot-scope="{row}">
<div style="margin-top: 5px;height: 70px; display: flex;"> <div style="margin-top: 5px;height: 70px; display: flex;">
<div style=""> <div style="">
<img :src="scope.row.thumbnail" style="height: 60px;margin-top: 3px;width: 60px"> <img :src="row.thumbnail" style="height: 60px;margin-top: 3px;width: 60px">
</div> </div>
<div style="margin-left: 13px;"> <div style="margin-left: 13px;">
<div class="div-zoom" > <div class="div-zoom">
<a @click="linkTo(scope.row.id,scope.row.skuId)">{{scope.row.goodsName}}</a> <a @click="linkTo(row.id,row.skuId)">{{row.goodsName}}</a>
</div> </div>
<Poptip trigger="hover" title="扫码APP查看" transfer>
<div slot="content">
<vue-qr :text="wapLinkTo(row.id,row.skuId)" :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
</div>
<img src="../../assets/qrcode.svg" class="hover-pointer" width="20" height="20" alt="">
</Poptip>
</div> </div>
</div> </div>

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

@ -527,10 +527,10 @@
@on-change="logisticsTemplateChange" @on-change="logisticsTemplateChange"
v-model="baseInfoForm.freightPayer" v-model="baseInfoForm.freightPayer"
> >
<Radio label="BUYER"> <Radio label="STORE">
<span>卖家承担运费</span> <span>卖家承担运费</span>
</Radio> </Radio>
<Radio label="STORE"> <Radio label="BUYER">
<span>使用物流规则</span> <span>使用物流规则</span>
</Radio> </Radio>
</RadioGroup> </RadioGroup>
@ -709,7 +709,7 @@ export default {
this.baseInfoForm = { this.baseInfoForm = {
salesModel: "RETAIL", salesModel: "RETAIL",
goodsParamsList: [], goodsParamsList: [],
freightPayer: "BUYER", freightPayer: "STORE",
weight: "", weight: "",
goodsGalleryFiles: [], goodsGalleryFiles: [],
release: "true", release: "true",
@ -853,7 +853,7 @@ export default {
/** 商品参数列表 */ /** 商品参数列表 */
goodsParamsList: [], goodsParamsList: [],
/** 运费承担者 */ /** 运费承担者 */
freightPayer: "BUYER", freightPayer: "STORE",
/** 商品重量 */ /** 商品重量 */
weight: "", weight: "",
/** 商品相册列表 */ /** 商品相册列表 */
@ -1016,7 +1016,7 @@ export default {
this.baseInfoForm = { this.baseInfoForm = {
salesModel: "RETAIL", salesModel: "RETAIL",
goodsParamsList: [], goodsParamsList: [],
freightPayer: "BUYER", freightPayer: "STORE",
weight: "", weight: "",
goodsGalleryFiles: [], goodsGalleryFiles: [],
release: "true", release: "true",

17
seller/src/views/login.vue
View File

@ -56,7 +56,7 @@
</Row> </Row>
<Footer /> <Footer />
</Col> </Col>
<LangSwitch /> <!-- <LangSwitch /> -->
</Row> </Row>
</div> </div>
</template> </template>
@ -65,8 +65,6 @@
import { import {
login, login,
userMsg, userMsg,
initCaptcha,
drawCodeImage,
} from "@/api/index"; } from "@/api/index";
import { validateMobile } from "@/libs/validate"; import { validateMobile } from "@/libs/validate";
import Cookies from "js-cookie"; import Cookies from "js-cookie";
@ -135,13 +133,6 @@ export default {
// 获取用户信息 // 获取用户信息
userMsg().then((res) => { userMsg().then((res) => {
if (res.success) { if (res.success) {
// 避免超过大小限制
/* delete res.result.permissions;
let roles = [];
res.result.roles.forEach((e) => {
roles.push(e.name);
});
this.setStore("roles", roles); */
this.setStore("saveLogin", this.saveLogin); this.setStore("saveLogin", this.saveLogin);
if (this.saveLogin) { if (this.saveLogin) {
// 保存7天 // 保存7天
@ -180,11 +171,7 @@ export default {
} }
}) })
}, },
}
},
mounted() {
// this.getCaptchaImg();
},
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>