Skip to content

P
pica.cloud.web-education-admin
提交 704bcc9e 编写于 作者: 张磊's avatar 张磊
浏览文件
操作

Merge branch 'feature/zl' into 'release' 

Feature/zl

See merge request com.pica.cloud.education.frontend/pica.cloud.web-education-admin!393
上级 3cfe1f36 3b6d5152
隐藏空白字符变更
内嵌 并排
正在显示 包含 82 行增加 和 31 行删除
src/views/shop/create-shop.vue
浏览文件 @ 704bcc9e
...@@ -320,17 +320,17 @@ ...@@ -320,17 +320,17 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-form-item <!-- <el-form-item-->
label="医疗资质" <!-- label="医疗资质"-->
prop="storeQualityUrl" <!-- prop="storeQualityUrl"-->
> <!-- >-->
<el-input <!-- <el-input-->
size="small" <!-- size="small"-->
v-model="formData.storeQualityUrl" <!-- v-model="formData.storeQualityUrl"-->
placeholder="请填写URL,仅对批发商品生效" <!-- placeholder="请填写URL,仅对批发商品生效"-->
style="width: 35%" <!-- style="width: 35%"-->
></el-input> <!-- ></el-input>-->
</el-form-item> <!-- </el-form-item>-->
</div> </div>
</div> </div>
<el-form-item <el-form-item
...@@ -1731,14 +1731,14 @@ export default { ...@@ -1731,14 +1731,14 @@ export default {
storejs.remove('store_info'); storejs.remove('store_info');
this.curmbSecond = "新建店铺"; this.curmbSecond = "新建店铺";
this.isDisabled = false; this.isDisabled = false;
if(s){ // if(s){
// 存在数据 就反现 // // 存在数据 就反现
this.formData = s; // this.formData = s;
const {areaStr} = s.certifyReq; // const {areaStr} = s.certifyReq;
const v = areaStr.map(i => {return i.label;}).join('/'); // const v = areaStr.map(i => {return i.label;}).join('/');
this.orgRegionValueFirst = v; // this.orgRegionValueFirst = v;
this.orgDateReverse(); // this.orgDateReverse();
} // }
} }
} }
}, },
...@@ -3130,6 +3130,7 @@ export default { ...@@ -3130,6 +3130,7 @@ export default {
max-width: 1400px; max-width: 1400px;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
flex-wrap: wrap;
.el-range-editor{ .el-range-editor{
width: 500px; width: 500px;
} }
......
src/views/shop/shop-list.vue
浏览文件 @ 704bcc9e
...@@ -185,17 +185,17 @@ ...@@ -185,17 +185,17 @@
<el-button @click="editShop(scope.row, 'true')" type="text" size="small">查看</el-button> <el-button @click="editShop(scope.row, 'true')" type="text" size="small">查看</el-button>
<el-button @click="editShop(scope.row, 'false')" type="text" size="small">编辑</el-button> <el-button v-if="checkIsEdit(scope.row)" checkIsEdit @click="editShop(scope.row, 'false')" type="text" size="small">编辑</el-button>
<el-button @click="shopManage(scope.row)" type="text" size="small">商品管理</el-button> <el-button v-if="checkGoods(scope.row)" @click="shopManage(scope.row)" type="text" size="small">商品管理</el-button>
<el-button @click="orderManage(scope.row)" type="text" size="small">订单管理</el-button> <el-button v-if="checkBills(scope.row)" @click="orderManage(scope.row)" type="text" size="small">订单管理</el-button>
<el-button @click="setPrice(scope.row, false)" type="text" size="small">设置分佣</el-button> <el-button v-if="checkSpe(scope.row)" @click="setPrice(scope.row, false)" type="text" size="small">设置分佣</el-button>
<el-button @click="setFreight(scope.row)" type="text" size="small">运费配置</el-button> <el-button v-if="checkSpe(scope.row)" @click="setFreight(scope.row)" type="text" size="small">运费配置</el-button>
<el-button @click="closeShopAction(scope.row)" type="text" size="small">关闭店铺</el-button> <el-button v-if="scope.row.tradeStore.storeType == 3 && isOutsideGetted == 'no'" @click="closeShopAction(scope.row)" type="text" size="small">关闭店铺</el-button>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
...@@ -273,12 +273,14 @@ ...@@ -273,12 +273,14 @@
import { openLoading, closeLoading } from "../../utils/utils"; import { openLoading, closeLoading } from "../../utils/utils";
import BreadCrumb from "@/components/breadcrumb.vue"; import BreadCrumb from "@/components/breadcrumb.vue";
import { queryStore, queryShopAuth, closeShop } from '@/utils/shop'; import { queryStore, queryShopAuth, closeShop } from '@/utils/shop';
import { getUserTypeReq } from "@/utils/cme/cmeApi";
export default { export default {
components: { components: {
BreadCrumb BreadCrumb
}, },
data(){ data(){
return{ return{
isOutsideGetted: 'no',
curmbFirst: '云鹊店铺', curmbFirst: '云鹊店铺',
showAllFlag: false, showAllFlag: false,
showNewFlag: false, showNewFlag: false,
...@@ -326,13 +328,17 @@ ...@@ -326,13 +328,17 @@
}], }],
storeTypeList: [ storeTypeList: [
{
value: 1,
label: "待完善"
},
{ {
value: 2, value: 2,
label: "认证提交中" label: "待审核"
}, },
{ {
value: 3, value: 3,
label: "认证通过" label: "审核通过"
}, },
{ {
value: 4, value: 4,
...@@ -372,6 +378,7 @@ ...@@ -372,6 +378,7 @@
// this.idType = localStorage.getItem("storageIdType"); // this.idType = localStorage.getItem("storageIdType");
this.storageIdType = localStorage.getItem("storageIdType") - 0; this.storageIdType = localStorage.getItem("storageIdType") - 0;
console.log(this.storageIdType); console.log(this.storageIdType);
this.getUserTypeReq();
this.getAddAuth(); this.getAddAuth();
this.searchList(); this.searchList();
}, },
...@@ -384,6 +391,15 @@ ...@@ -384,6 +391,15 @@
} }
}) })
}, },
getUserTypeReq () {
getUserTypeReq().then(res => {
console.log('--res', res);
if(res.code == '000000'){
this.isOutsideGetted = res.data.code;
}
});
},
searchList() { searchList() {
openLoading(this); openLoading(this);
let params = this.searchForm; let params = this.searchForm;
...@@ -693,14 +709,48 @@ ...@@ -693,14 +709,48 @@
}, },
checkIsEdit (row){ checkIsEdit (row){
const {storeType, certifyStatus} = row.tradeStore; const {storeType, certifyStatus} = row.tradeStore;
if(storeType == 1 && certifyStatus == 3){ if(storeType == 1 && Number(certifyStatus) > 2){
return true;
}else if(storeType == 2){
return true;
}else{
return false;
}
},
checkGoods(row) {
const {storeType, certifyStatus} = row.tradeStore;
if(storeType == 1 && Number(certifyStatus) === 3){
return true return true
}else if(storeType == 2 && (certifyStatus == 1 || certifyStatus == 3)){ }else if(storeType == 2){
return true return true
}else if(storeType == 3 && certifyStatus>2) { }else if(storeType == 3){
if(Number(certifyStatus) == 1 || Number(certifyStatus) == 3){
return true;
}else{
return false;
}
}else{
return false;
}
},
checkBills(row) {
const {storeType, certifyStatus} = row.tradeStore;
if(storeType == 1 && Number(certifyStatus) !== 3){
return false; return false;
}else{
return true;
} }
} },
checkSpe(row) {
const {storeType, certifyStatus} = row.tradeStore;
if(storeType == 1 && Number(certifyStatus) == 3){
return true;
}else if(storeType == 2){
return true;
}else{
return false;
}
},
}, },
filters: { filters: {
storeTypeFormat: function(value){ storeTypeFormat: function(value){
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或