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

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

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

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>

6
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">
@@ -292,7 +292,7 @@ export default {
picTitle: "", // 图片title
videoTitle: "", // 视频title
modalTitle: "", // 添加或编辑标题
searchForm: {
searchForm: {
// 搜索框对应data对象
name: "",
fileKey: "",

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>

4
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>
@@ -763,4 +763,4 @@
}
};
</script>
</script>

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 => {