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

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

# Conflicts:
#	seller/src/config/index.js
master
mabo 2021-05-17 18:13:56 +08:00
parent 70686e45d2 c457f6abc9
commit c3ed622031
40 changed files with 62 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buyer/config/index.js
View File

@ -22,7 +22,7 @@ module.exports = {
// Various Dev Server settings
host: '0.0.0.0', // can be overwritten by process.env.HOST
port: 8889, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
port: 10000, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: false,
errorOverlay: true,
notifyOnErrors: true,

4
buyer/src/components/invoiceModal/index.vue
View File

@ -19,7 +19,7 @@
:label-width="110"
>
<FormItem label="发票类型">
<RadioGroup v-model="invoiceForm.type">
<RadioGroup v-model="invoiceForm.type" type="button" button-style="solid">
<Radio :label="1">个人</Radio>
<Radio :label="2">单位</Radio>
</RadioGroup>
@ -39,7 +39,7 @@
<i-input v-model="invoiceForm.taxpayerId"></i-input>
</FormItem>
<FormItem label="发票内容">
<RadioGroup v-model="invoiceForm.receiptContent">
<RadioGroup v-model="invoiceForm.receiptContent" type="button" button-style="solid">
<Radio label="不开发票">不开发票</Radio>
<Radio label="商品明细">商品明细</Radio>
</RadioGroup>

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

@ -17,10 +17,10 @@ export default {
* @description api请求基础路径
*/
api_dev: {
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: 'http://127.0.0.1:8890',
buyer: 'http://127.0.0.1:8888',
seller: 'http://127.0.0.1:8889',
manager: 'http://127.0.0.1:8887'
},
api_prod: {
common: 'https://common-api.pickmall.cn',

4
buyer/src/pages/home/memberCenter/Invoice.vue
View File

@ -19,7 +19,7 @@
:label-width="110"
>
<FormItem label="发票类型">
<RadioGroup v-model="form.type">
<RadioGroup v-model="form.type" type="button" button-style="solid">
<Radio :label="2">单位</Radio>
</RadioGroup>
</FormItem>
@ -36,7 +36,7 @@
<i-input v-model="form.taxpayerId"></i-input>
</FormItem>
<FormItem label="发票内容">
<RadioGroup v-model="form.receiptContent">
<RadioGroup v-model="form.receiptContent" type="button" button-style="solid">
<Radio label="商品明细">商品明细</Radio>
</RadioGroup>
</FormItem>

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

@ -24,7 +24,7 @@
<DatePicker type="date" placeholder="选择您的生日" v-model="formItem.birthday"></DatePicker>
</FormItem>
<FormItem label="性别">
<RadioGroup v-model="formItem.sex">
<RadioGroup v-model="formItem.sex" type="button" button-style="solid">
<Radio :label="1">男</Radio>
<Radio :label="0">女</Radio>
</RadioGroup>

2
buyer/src/pages/home/memberCenter/evaluation/AddEval.vue
View File

@ -28,7 +28,7 @@
<div class="eval-con">
<div>
<span class="color999">商品评价：</span>
<RadioGroup style="margin-bottom:5px;color:#999" v-model="orderGoods.grade">
<RadioGroup style="margin-bottom:5px;color:#999" v-model="orderGoods.grade" type="button" button-style="solid">
<Radio label="GOOD">好评</Radio>
<Radio label="MODERATE">中评</Radio>
<Radio label="WORSE">差评</Radio>

2
buyer/src/pages/home/memberCenter/evaluation/EvalDetail.vue
View File

@ -27,7 +27,7 @@
<div class="eval-con">
<div>
<span class="color999">商品评价：</span>
<RadioGroup style="margin-bottom:5px;color:#999" v-model="orderGoods.grade">
<RadioGroup style="margin-bottom:5px;color:#999" v-model="orderGoods.grade" type="button" button-style="solid">
<Radio label="GOOD" disabled>好评</Radio>
<Radio label="MODERATE" disabled>中评</Radio>
<Radio label="WORSE" disabled>差评</Radio>

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

@ -18,7 +18,7 @@
<div>
<Form :model="form" ref="form" :rules="rules" :label-width="80">
<FormItem label="售后类别">
<RadioGroup v-model="form.serviceType" @on-change="changeReason">
<RadioGroup v-model="form.serviceType" @on-change="changeReason" type="button" button-style="solid">
<Radio label="RETURN_GOODS">退货</Radio>
<Radio label="RETURN_MONEY">退款</Radio>
</RadioGroup>

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

@ -101,7 +101,7 @@
<div slot="footer"></div>
</Modal>
<Modal v-model="cancelAvail" title="请选择取消订单原因" @on-ok="sureCancel" @on-cancel="cancelAvail = false">
<RadioGroup v-model="cancelParams.reason" vertical>
<RadioGroup v-model="cancelParams.reason" vertical type="button" button-style="solid">
<Radio :label="item.reason" v-for="item in cancelReason" :key="item.id">
{{item.reason}}
</Radio>

8
manager/src/config/index.js
View File

@ -17,10 +17,10 @@ export default {
* @description api请求基础路径
*/
api_dev: {
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: 'http://127.0.0.1:8890',
buyer: 'http://127.0.0.1:8888',
seller: 'http://127.0.0.1:8889',
manager: 'http://127.0.0.1:8887'
},
api_prod: {
common: 'https://common-api.pickmall.cn',

2
manager/src/views/distribution/distributionCash.vue
View File

@ -42,7 +42,7 @@
<Input disabled v-model="form.price" clearable style="width:100%"/>
</FormItem>
<FormItem label="是否通过" prop="result" v-if="handleStatus =='edit'">
<RadioGroup v-model="result">
<RadioGroup v-model="result" type="button" button-style="solid">
<Radio :key=0 :label=0>通过</Radio>
<Radio :key=-1 :label=-1>拒绝</Radio>
</RadioGroup>

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

@ -84,7 +84,7 @@
<Input v-model="formValidate.nickName" style="width: 200px" />
</FormItem>
<FormItem label="性别" prop="sex">
<RadioGroup v-model="formValidate.sex">
<RadioGroup type="button" button-style="solid" v-model="formValidate.sex">
<Radio :label="1">
<span>男</span>
</Radio>

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

@ -351,7 +351,7 @@
<Input v-model="addressForm.alias" clearable style="width: 80%" maxlength="8"/>
</FormItem>
<FormItem label="默认" prop="isDefault">
<RadioGroup v-model="addressForm.isDefault">
<RadioGroup type="button" button-style="solid" v-model="addressForm.isDefault">
<Radio :label=true>是</Radio>
<Radio :label=false>否</Radio>
</RadioGroup>

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

@ -102,7 +102,7 @@
<Input v-model="formValidate.nickName" style="width: 200px"/>
</FormItem>
<FormItem label="性别" prop="sex">
<RadioGroup v-model="formValidate.sex">
<RadioGroup type="button" button-style="solid" v-model="formValidate.sex">
<Radio :label="1">
<span>男</span>
</Radio>

2
manager/src/views/member/message-manage/addOrEditMessage.vue
View File

@ -39,7 +39,7 @@
</FormItem>
<div v-if="type==0">
<FormItem label="发送范围">
<RadioGroup v-model="form.range">
<RadioGroup type="button" button-style="solid" v-model="form.range">
<Radio :label="0">全体用户</Radio>
<Radio :label="1">指定用户成员</Radio>
</RadioGroup>

2
manager/src/views/member/notice/addMessage.vue
View File

@ -24,7 +24,7 @@
</FormItem>
<div v-if="type==0">
<FormItem label="发送范围">
<RadioGroup v-model="form.sendType" >
<RadioGroup type="button" button-style="solid" v-model="form.sendType" >
<Radio label="ALL">全部会员</Radio>
<Radio label="SELECT">指定会员</Radio>
</RadioGroup>

2
manager/src/views/order/after-order/afterSaleOrderDetail.vue
View File

@ -77,7 +77,7 @@
<dt>是否同意</dt>
<dd>
<div class="div-content">
<RadioGroup v-model="params.serviceStatus">
<RadioGroup type="button" button-style="solid" v-model="params.serviceStatus">
<Radio label="PASS">
<span>同意</span>
</Radio>

2
manager/src/views/promotion/coupon/couponPublish.vue
View File

@ -57,7 +57,7 @@
</DatePicker>
</FormItem>
<FormItem label="使用范围" prop="scopeType">
<RadioGroup v-model="form.scopeType">
<RadioGroup type="button" button-style="solid" v-model="form.scopeType">
<Radio label="ALL">全品类</Radio>
<Radio label="PORTION_GOODS">指定商品</Radio>
<Radio label="PORTION_GOODS_CATEGORY">部分商品分类</Radio>

4
manager/src/views/promotion/fullCut/fullCutDetail.vue
View File

@ -53,7 +53,7 @@
<span class="describe">消费达到当前金额可以参与优惠</span>
</FormItem>
<FormItem label="优惠方式">
<RadioGroup v-model="form.discountType">
<RadioGroup type="button" button-style="solid" v-model="form.discountType">
<Radio label="isFullMinus" disabled>减现金</Radio>
<Radio label="isFullRate" disabled>打折</Radio>
</RadioGroup>
@ -140,7 +140,7 @@
/>
</FormItem>
<FormItem label="使用范围" prop="scopeType">
<RadioGroup v-model="form.scopeType">
<RadioGroup type="button" button-style="solid" v-model="form.scopeType">
<Radio label="ALL" disabled>全品类</Radio>
<Radio label="PORTION_GOODS" disabled>指定商品</Radio>
</RadioGroup>

2
manager/src/views/promotion/seckill/seckillGoods.vue
View File

@ -125,7 +125,7 @@
<Modal v-model="showModal" title="审核商品">
<Form ref="form" :model="params" :rules="rules">
<FormItem label="审核状态">
<RadioGroup v-model="params.applyStatus">
<RadioGroup v-model="params.applyStatus" type="button" button-style="solid">
<Radio label="PASS">通过</Radio>
<Radio label="REFUSE">拒绝</Radio>
</RadioGroup>

2
manager/src/views/region/index.vue
View File

@ -28,7 +28,7 @@
<Input v-model="formValidate.cityCode" />
</FormItem>
<FormItem label="行政区划级别" prop="cityCode">
<RadioGroup v-model="formValidate.level">
<RadioGroup type="button" button-style="solid" v-model="formValidate.level">
<Radio disabled label="country">国家</Radio>
<Radio disabled label="province">省份</Radio>
<Radio disabled label="city">市</Radio>

2
manager/src/views/seller/shop/shopAuditList.vue
View File

@ -113,7 +113,7 @@
color: params.row.selfOperated ? "default" : "primary",
},
},
params.row.selfOperated == 0 ? "自营" : "非自营"
params.row.selfOperated ? "自营" : "非自营"
);
},
},

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

@ -18,7 +18,7 @@
</div>
<div class="bottom-info">
<p v-if="storeInfo.createTime">{{storeInfo.createTime}}&nbsp;开店</p>
<p v-if="storeInfo.selfOperated == 0">
<p v-if="storeInfo.selfOperated == 1">
<Tag color="success">自营</Tag>
</p>
<p v-else>

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

@ -20,9 +20,10 @@
</FormItem>
<FormItem label="是否自营" prop="selfOperated">
<RadioGroup v-model="shopForm.selfOperated">
<Radio :key=0 :label=0>自营</Radio>
<Radio :key=1 :label=1>非自营</Radio>
<RadioGroup type="button" button-style="solid" v-model="shopForm.selfOperated" >
<Radio :label=true>自营</Radio>
<Radio :label=false>非自营</Radio>
</RadioGroup>
</FormItem>
@ -340,7 +341,7 @@ export default {
settlementCycle: [], // 结算周期
shopForm: { // 店铺数据
settlementCycle: "",
selfOperated: 0,
selfOperated: "",
memberName: "",
companyName: "",
addressPath: "",

4
manager/src/views/sys/app-version/appVersion.vue
View File

@ -77,13 +77,13 @@
></DatePicker>
</FormItem>
<FormItem label="强制更新">
<RadioGroup v-model="form.forceUpdate">
<RadioGroup type="button" button-style="solid" v-model="form.forceUpdate">
<Radio label="1">强制更新</Radio>
<Radio label="0">非强制更新</Radio>
</RadioGroup>
</FormItem>
<FormItem label="类型">
<RadioGroup v-model="form.type">
<RadioGroup type="button" button-style="solid" v-model="form.type">
<Radio label="IOS">苹果</Radio>
<Radio label="ANDROID">安卓</Radio>
</RadioGroup>

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

@ -156,7 +156,7 @@
/>
</FormItem>
<FormItem label="发送范围">
<RadioGroup v-model="messageSendForm.messageRange" @on-change="selectShop">
<RadioGroup type="button" button-style="solid" v-model="messageSendForm.messageRange" @on-change="selectShop">
<Radio label="ALL">全站</Radio>
<Radio label="APPOINT">指定商家</Radio>
</RadioGroup>
@ -200,7 +200,7 @@
/>
</FormItem>
<FormItem label="发送范围">
<RadioGroup v-model="messageSendForm.messageRange">
<RadioGroup type="button" button-style="solid" v-model="messageSendForm.messageRange">
<Radio disabled label="ALL">全站</Radio>
<Radio disabled label="APPOINT">指定商家</Radio>
</RadioGroup>

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

@ -115,7 +115,7 @@
<p>
已选<span style="color: #f56c1d"> {{memberNum}}</span>人，预计耗费条数<span style="color: #f56c1d">{{this.smsForm.num}}条</span>
</p>
<RadioGroup @on-change="smsRangeChange" v-model="smsForm.smsRange">
<RadioGroup type="button" button-style="solid" @on-change="smsRangeChange" v-model="smsForm.smsRange">
<Radio label="1">全部会员</Radio>
<Radio label="2">自定义选择</Radio>
</RadioGroup>

4
manager/src/views/sys/oss-manage/ossManage.vue
View File

@ -69,7 +69,7 @@
<RadioGroup
v-model="fileType"
@on-change="changeFileType"
type="button"
type="button" button-style="solid"
style="margin-right: 25px"
>
<Radio label="all">所有类型</Radio>
@ -78,7 +78,7 @@
</RadioGroup>
<RadioGroup
v-model="showType"
type="button"
type="button" button-style="solid"
@on-change="changeShowType"
>
<Radio title="列表" label="list">

2
manager/src/views/sys/role-manage/roleManage.vue
View File

@ -162,7 +162,7 @@
>
<div v-for="(item, index) in saveRoleWay" :key="index">
<span class="title">{{ item.title }}</span>
<RadioGroup v-model="item.isSuper">
<RadioGroup type="button" button-style="solid" v-model="item.isSuper">
<Radio :label="true">
<span>操作数据权限</span>
</Radio>

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

@ -103,7 +103,7 @@
:rules="goodsValidate"
>
<FormItem label="是否开启商品审核" prop="goodsCheck">
<RadioGroup v-model="goods.goodsCheck">
<RadioGroup type="button" button-style="solid" v-model="goods.goodsCheck">
<Radio label="OPEN">开启</Radio>
<Radio label="CLOSE">关闭</Radio>
</RadioGroup>

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

@ -2,7 +2,7 @@
<div class="layout">
<Form ref="formValidate" :label-width="150" label-position="right" :model="formValidate" :rules="ruleValidate">
<FormItem label="商品审核" prop="goodsCheck">
<RadioGroup v-model="formValidate.goodsCheck">
<RadioGroup type="button" button-style="solid" v-model="formValidate.goodsCheck">
<Radio label="true">开启</Radio>
<Radio label="false">关闭</Radio>

2
manager/vue.config.js
View File

@ -17,7 +17,7 @@ module.exports = {
}
},
devServer: {
port: 9999
port: 10003
},
chainWebpack: config => {

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

@ -75,7 +75,7 @@
<Modal title="批量设置运费模板" v-model="shipTemplateModal" :mask-closable="false" :width="500">
<Form ref="shipTemplateForm" :model="shipTemplateForm" :label-width="120">
<FormItem class="form-item-view-el" label="运费" prop="freightPayer">
<RadioGroup @on-change="logisticsTemplateUndertakerChange" v-model="shipTemplateForm.freightPayer">
<RadioGroup type="button" button-style="solid" @on-change="logisticsTemplateUndertakerChange" v-model="shipTemplateForm.freightPayer">
<Radio label="BUYER">
<span>买家承担运费</span>
</Radio>

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

@ -139,7 +139,7 @@
label="销售模式"
prop="salesModel"
>
<RadioGroup v-model="baseInfoForm.salesModel">
<RadioGroup type="button" button-style="solid" v-model="baseInfoForm.salesModel">
<Radio title="零售型" label="RETAIL">
<span>零售型</span>
</Radio>
@ -523,7 +523,7 @@
</Input>
</FormItem>
<FormItem class="form-item-view-el" label="运费" prop="skuList">
<RadioGroup
<RadioGroup type="button" button-style="solid"
@on-change="logisticsTemplateChange"
v-model="baseInfoForm.freightPayer"
>
@ -554,7 +554,7 @@
<h4>其他信息</h4>
<div class="form-item-view">
<FormItem class="form-item-view-el" label="商品发布" prop="release">
<RadioGroup v-model="baseInfoForm.release">
<RadioGroup type="button" button-style="solid" v-model="baseInfoForm.release">
<Radio title="立即发布" label="true">
<span>立即发布</span>
</Radio>
@ -564,7 +564,7 @@
</RadioGroup>
</FormItem>
<FormItem class="form-item-view-el" label="商品推荐" prop="skuList">
<RadioGroup v-model="baseInfoForm.recommend">
<RadioGroup type="button" button-style="solid" v-model="baseInfoForm.recommend">
<Radio title="推荐" label="true">
<span>推荐</span>
</Radio>

2
seller/src/views/order/after-order/reurnGoodsOrderDetail.vue
View File

@ -84,7 +84,7 @@
<dt>是否同意</dt>
<dd>
<div class="div-content">
<RadioGroup v-model="params.serviceStatus">
<RadioGroup type="button" button-style="solid" v-model="params.serviceStatus">
<Radio label="PASS">
<span>同意</span>
</Radio>

2
seller/src/views/promotion/coupon/couponPublish.vue
View File

@ -114,7 +114,7 @@
</DatePicker>
</FormItem>
<FormItem label="使用范围" prop="scopeType">
<RadioGroup v-model="form.scopeType">
<RadioGroup type="button" button-style="solid" v-model="form.scopeType">
<Radio label="ALL">全品类</Radio>
<Radio label="PORTION_GOODS">指定商品</Radio>
<Radio label="PORTION_GOODS_CATEGORY">部分商品分类</Radio>

4
seller/src/views/promotion/fullCut/newFullCut.vue
View File

@ -53,7 +53,7 @@
<span class="describe">消费达到当前金额可以参与优惠</span>
</FormItem>
<FormItem label="优惠方式">
<RadioGroup v-model="form.discountType">
<RadioGroup type="button" button-style="solid" v-model="form.discountType">
<Radio
:disabled="form.promotionStatus != 'NEW'"
label="isFullMinus"
@ -163,7 +163,7 @@
/>
</FormItem>
<FormItem label="使用范围" prop="scopeType">
<RadioGroup v-model="form.scopeType">
<RadioGroup type="button" button-style="solid" v-model="form.scopeType">
<Radio :disabled="form.promotionStatus != 'NEW'" label="ALL"
>全品类</Radio
>

2
seller/src/views/promotion/pintuan/newPintuan.vue
View File

@ -47,7 +47,7 @@
<span style="color: #cccccc">如果设置为0则视为不限制购买数量</span>
</FormItem>
<FormItem label="虚拟成团" prop="fictitious">
<RadioGroup v-model="form.fictitious">
<RadioGroup type="button" button-style="solid" v-model="form.fictitious">
<Radio title="开启" :label="true">
<span>开启</span>
</Radio>

2
seller/src/views/shop/ship/shipTemplate.vue
View File

@ -65,7 +65,7 @@
<Input v-model="form.name" maxlength="10" clearable style="width: 20%"/>
</FormItem>
<FormItem label="计价方式" prop="pricingMethod">
<RadioGroup v-model="form.pricingMethod">
<RadioGroup type="button" button-style="solid" v-model="form.pricingMethod">
<Radio label="WEIGHT">按重量</Radio>
<Radio label="NUM">按件数</Radio>
</RadioGroup>

2
seller/vue.config.js
View File

@ -16,7 +16,7 @@ module.exports = {
}
},
devServer: {
port: 9998,
port: 10002,
},
chainWebpack: config => {