Skip to content

S
shop-new
提交 fdadc602 authored 作者: huaxinzhu's avatar huaxinzhu
浏览文件
操作

云仓2.2部分

上级 660f2894
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 159 行增加 和 181 行删除
public/index.html
浏览文件 @ fdadc602
......@@ -227,9 +227,9 @@
}
}
};
xhttp.open("GET", '//sysapi.jxhh.com/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 正式环境
// xhttp.open("GET", '//sysapi.jxhh.com/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 正式环境
// xhttp.open("GET", '//newsys.jxhh.com/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 内网开发
// xhttp.open("GET", 'http://192.168.26.179:6601/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 测试环境
xhttp.open("GET", 'http://192.168.26.179:6601/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 测试环境
xhttp.send();
}
</script>
......
src/api/module/bankcard.js
浏览文件 @ fdadc602
import request from '@/utils/request'
// 查询bankcard列表
// export function listBankcard(query) {
// return request({
// url: '/system/bankcard/list',
// method: 'get',
// params: query
// })
// }
// 查询银行名称列表
// export function listBankname(query) {
// return request({
// url: '/system/bankcard/getBankList',
// method: 'get',
// params: query
// })
// }
// 查询bankcard详细
// export function getBankcard (id) {
// return request({
// url: '/system/bankcard/edit?id='+id,
// method: 'get'
// })
// }
// 修改bankcard
// export function updateBankcard(data) {
// return request({
// url: '/system/bankcard/edit',
// method: 'post',
// data: data
// })
// }
// 删除bankcard
// export function delBankcard(ids) {
// return request({
// url: '/system/bankcard/delete',
// method: 'delete',
// data:{id:ids}
// })
// }
// 我的资产 页面 所有数据
export function getMyAssetListData(data) {
return request({
......@@ -53,6 +9,15 @@ export function getMyAssetListData(data) {
})
}
// 获取 提现等权限 getPurviewData
export function getPurviewData(query) {
return request({
url: '/local/getOrganization',
method: 'get',
params: query
})
}
// 获取 主体信息
export function getOrganizationData(query) {
return request({
......
src/api/webSite.js
浏览文件 @ fdadc602
......@@ -3,8 +3,8 @@ import request from '@/utils/request'
// 获取渠道id
export function indexInfo(params) {
return request({
url: 'http://sysapi.jxhh.com/api/v1/oem/webSite/domainChannel',
// url: 'http://192.168.26.179:6601/api/v1/oem/webSite/domainChannel',
// url: 'http://sysapi.jxhh.com/api/v1/oem/webSite/domainChannel',
url: 'http://192.168.26.179:6601/api/v1/oem/webSite/domainChannel',
// url: 'http://newsys.jxhh.com/api/v1/oem/webSite/domainChannel',
method: 'get',
params
......@@ -13,8 +13,8 @@ export function indexInfo(params) {
// 获取所有域名
export function getdomain(params) {
return request({
url: 'http://sysapi.jxhh.com/api/v1/oem/channel/domainFront',
// url: 'http://192.168.26.179:6601/api/v1/oem/channel/domainFront',
// url: 'http://sysapi.jxhh.com/api/v1/oem/channel/domainFront',
url: 'http://192.168.26.179:6601/api/v1/oem/channel/domainFront',
// url: 'http://newsys.jxhh.com/api/v1/oem/channel/domainFront',
method: 'get',
params
......@@ -23,8 +23,8 @@ export function getdomain(params) {
// 获取官网设置接口
export function webSite(params) {
return request({
url: 'http://sysapi.jxhh.com/api/v1/oem/common/counsel',
// url: 'http://192.168.26.179:6601/api/v1/oem/common/counsel',
// url: 'http://sysapi.jxhh.com/api/v1/oem/common/counsel',
url: 'http://192.168.26.179:6601/api/v1/oem/common/counsel',
// url: 'http://newsys.jxhh.com/api/v1/oem/common/counsel',
method: 'get',
params
......@@ -34,8 +34,8 @@ export function webSite(params) {
// 云仓所有列表——Banner和域名/产品和服务/供应商入驻
export function getallCloudList(params) {
return request({
url: 'http://sysapi.jxhh.com/api/v1/oem/front/CloudList',
// url: 'http://192.168.26.179:6601/api/v1/oem/front/CloudList',
// url: 'http://sysapi.jxhh.com/api/v1/oem/front/CloudList',
url: 'http://192.168.26.179:6601/api/v1/oem/front/CloudList',
// url: 'http://newsys.jxhh.com/api/v1/oem/front/CloudList',
method: 'get',
params
......@@ -44,8 +44,8 @@ export function getallCloudList(params) {
//获取sso域名
export function getssoUrl(data) {
return request({
url: '//sysapi.jxhh.com/api/v1/oem/webSite/ssoChannel',
// url: '//192.168.26.179:6601/api/v1/oem/webSite/ssoChannel',
// url: '//sysapi.jxhh.com/api/v1/oem/webSite/ssoChannel',
url: '//192.168.26.179:6601/api/v1/oem/webSite/ssoChannel',
// url: 'http://newsys.jxhh.com/api/v1/oem/webSite/ssoChannel',
method: 'get',
params: data
......
src/views/system/asset/myAsset/index.vue
浏览文件 @ fdadc602
......@@ -32,8 +32,9 @@
</dl>
</div>
</div>
<div class="row-flex-center">
<el-button type="primary" size="small" style="padding: 10px 30px; margin: 20px 0 40px;" @click="handleWithdraw">提 现</el-button>
<div class="row-flex-center" style="margin: 0 0 20px;">
<el-button :disabled="isAllowWithdraw" type="primary" size="small" style="padding: 10px 30px; margin: 20px 0;" @click="handleWithdraw">提 现</el-button>
<span v-if="isAllowWithdraw" class="spe-tip"><i class="el-icon-warning h-warning"></i>温馨提示：您的账户被禁止提现，请联系工作人员</span>
</div>
<!-- 账号管理 -->
......@@ -67,10 +68,6 @@
</div>
</div>
<!-- <div class="row-flex-center">-->
<!-- <el-button type="primary" size="small" style="padding: 10px 30px; margin: 20px 40px 40px 0;">编 辑</el-button>-->
<!-- <el-button type="primary" size="small" style="padding: 10px 30px; margin: 20px 0 40px;">删 除</el-button>-->
<!-- </div>-->
</el-card>
<!-- 添加、编辑 银行卡 信息 -->
......@@ -129,7 +126,7 @@
</template>
<script>
import { getMyAssetListData,getOrganizationData, getBankDetailsData,getBankcardListData, addBankcardData,editBankcardData ,delBankcardData } from '@/api/module/bankcard'
import { getPurviewData,getMyAssetListData,getOrganizationData, getBankDetailsData,getBankcardListData, addBankcardData,editBankcardData ,delBankcardData } from '@/api/module/bankcard'
export default {
name: "Index",
data() {
......@@ -138,6 +135,7 @@
currentBalance: 0,
withdrawalBalance: 0,
withdrawalProgress: 0,
isAllowWithdraw: false, // 能否操作提现，sys可设置
bankcardList: [],
addBankcardInfoDialog: false,
bankcardTitle: '',
......@@ -165,8 +163,18 @@
this.getBankcardList()
/** 获取主体信息 */
this.getOrganization();
/** 获取 提现等操作权限 */
this.getPurview();
},
methods: {
/** 获取 提现等操作权限 */
getPurview() {
getPurviewData().then(res=> {
if (res.code == 1) {
//this.isAllowWithdraw = res.data.is_allow_withdraw;
}
});
},
/** 我的资产 所有数据 */
getMyAssetList() {
getMyAssetListData( {seller_id:this.seller_id} ).then(res=> {
......@@ -446,12 +454,22 @@
left: calc(50% - 26px);
}
.spe-tip {
font-size: 12px;
color: #909399;
padding: 0 0 0 10px;
}
.h-warning:before {
color: #e3c300;
padding: 0 3px;
}
/* el-card title hxz 样式统一 end */
.row-flex-center {
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
text-align: center;
}
.row-flex-space-around {
......@@ -493,15 +511,6 @@
box-shadow :0 2px 10px 0 rgba(0,0,0,0.05);
}
/*.card-con:hover {*/
/* box-shadow :0 2px 10px 0 rgba(0,0,0,0.1);*/
/*}*/
/* 点击效果 */
.checked-bankcard {
}
.card-name {
height: 60px;
line-height: 60px;
......
src/views/system/goodsimport/goodsgement.vue
浏览文件 @ fdadc602
<template>
<div class="app-container">
<el-card class="box-card">
<el-card class="box-card goods-manage-card">
<div slot="header" class="clearfix">
<el-radio-group v-model="radiomodel" class="radiomodels" @change="radiomodelbtn">
<el-radio-button :label="1">上架销售中（{{onsale_count}}）</el-radio-button>
......@@ -23,7 +23,6 @@
<el-option label="全部" value="5" v-if='radiomodel==3'></el-option>
<el-option label="审核中" value="1" v-if='radiomodel==3'></el-option>
<el-option label="审核拒绝" value="2" v-if='radiomodel==3'></el-option>
</el-select>
</el-form-item>
<el-form-item label="发布时间">
......@@ -101,15 +100,24 @@
@click="handledelsale('9','return','all')"
>批量还原
</el-button>
<el-button
v-if='radiomodel==3'
:disabled="multiple"
style="float:right;margin-left: 20px;align-items:normal"
type="primary"
size="mini"
@click="handleCancelUpale"
>批量取消申请上架
</el-button>
</div>
</el-col>
</el-row>
</el-form>
<el-table v-loading="loading" :data="freightList" :height="tableHeight" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="freightList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="商品主图" width="95" align="center">
<template slot-scope="scope">
<img :src="scope.row.default_image" alt="" style="width:80px;height:80px;">
<img :src="scope.row.default_image" alt="" style="width:60px;height:60px;">
</template>
</el-table-column>
<el-table-column label="商品编号" align="center" prop="goods_id"/>
......@@ -135,6 +143,7 @@
</template>
</el-table-column>
<el-table-column label="发布时间" align="center" :formatter="formatTime" prop="add_time"/>
<el-table-column label="审核说明" align="center" prop="shsm" width="240px"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<div v-if='radiomodel==3&&scope.row.up_onsale===1'>
......@@ -248,8 +257,8 @@
price_min: '',
price_max: ''
},
fullHeight: 0,
tableHeight: 0,
// fullHeight: 0,
// tableHeight: 0,
// 遮罩层
loading: false,
// 选中数组
......@@ -302,17 +311,17 @@
this.radiomodel = Number(this.$route.query.goodsStatus);
}
this.getList();
this.$nextTick(() => {
let headerHeight = document.getElementsByClassName('queryFormInline')[0].clientHeight
this.fullHeight = document.getElementsByClassName('box-card')[0].clientHeight - headerHeight
})
// this.$nextTick(() => {
// let headerHeight = document.getElementsByClassName('queryFormInline')[0].clientHeight
// this.fullHeight = document.getElementsByClassName('box-card')[0].clientHeight - headerHeight
// })
},
watch: {
fullHeight(val) {
let headerHeight = document.getElementsByClassName('queryFormInline')[0].clientHeight
let formHeight = document.getElementsByClassName('clearfix')[0].clientHeight
this.tableHeight = val - formHeight - 40 - headerHeight
}
// fullHeight(val) {
// let headerHeight = document.getElementsByClassName('queryFormInline')[0].clientHeight
// let formHeight = document.getElementsByClassName('clearfix')[0].clientHeight
// this.tableHeight = val - formHeight - 40 - headerHeight
// }
},
methods: {
handledelgrain(row, isall) { //彻底删除
......@@ -434,7 +443,6 @@
// 下架/申请上架
handleUpsale(row, status, isall) { //上下架
//debugger
//console.log(442,row);
let good_id, is_onsale, title, message
if (isall == 'one') {
......@@ -495,6 +503,23 @@
});
},
/** 批量取消申请上架 */
handleCancelUpale() {
// id组成的数组 this.ids
this.$confirm('是否批量取消所选中的商品的上架申请', '批量取消申请上架', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
center: true
}).then(async() => {
let res = ''//await fn(re)
if (res.code == 1) {
this.$message({type:'success',message:'批量取消成功'});
} else {
this.$message({type:'success',message: res.message ? res.message : 0});
}
}).catch(() => {});
},
// 取消上架申请
handleCancelUpsale(row) {
let id = {
......@@ -617,7 +642,7 @@
}
if (this.formInline.uptime && this.formInline.uptime.length == 2) {
data['start_time'] = this.formInline.uptime[0] / 1000
data['end_time'] = this.formInline.uptime[1] / 1000
data['end_time'] = this.formInline.uptime[1] / 1000 + 86399
}
if (this.formInline.price_min && this.formInline.price_max) {
data['price_min'] = this.formInline.price_min
......@@ -663,6 +688,15 @@
};
</script>
<style scoped lang="scss" type="text/stylus">
.app-container {
width: 100%;
height: 100%;
}
.goods-manage-card >>> .el-card__body {
height: calc(100% - 61px);
overflow-y : auto;
}
.freightTemplate-add {
/deep/ .el-dialog {
height: 80%;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论