Skip to content

P
pica.cloud.web-education-admin
提交 84ba7c43 编写于 作者: tao.wu's avatar tao.wu
浏览文件
操作

Merge branch 'dev_sales_return_1110' into dev-check-serve-20201103

上级 0c488269 259ba0be
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 2405 行增加 和 537 行删除
package-lock.json
浏览文件 @ 84ba7c43
......@@ -2803,10 +2803,6 @@
"loader-utils": "~0.2.5"
}
},
"file-saver": {
"version": "github:eligrey/FileSaver.js#e865e37af9f9947ddcced76b549e27dc45c1cb2e",
"from": "github:eligrey/FileSaver.js#1.3.8"
},
"filename-regex": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
......@@ -2961,7 +2957,8 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"aproba": {
"version": "1.2.0",
......@@ -2982,12 +2979,14 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
......@@ -3002,17 +3001,20 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"core-util-is": {
"version": "1.0.2",
......@@ -3129,7 +3131,8 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"ini": {
"version": "1.3.5",
......@@ -3141,6 +3144,7 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
......@@ -3155,6 +3159,7 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
......@@ -3162,12 +3167,14 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"minipass": {
"version": "2.2.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.1",
"yallist": "^3.0.0"
......@@ -3186,6 +3193,7 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"minimist": "0.0.8"
}
......@@ -3266,7 +3274,8 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"object-assign": {
"version": "4.1.1",
......@@ -3278,6 +3287,7 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"wrappy": "1"
}
......@@ -3363,7 +3373,8 @@
"safe-buffer": {
"version": "5.1.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"safer-buffer": {
"version": "2.1.2",
......@@ -3399,6 +3410,7 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
......@@ -3418,6 +3430,7 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
......@@ -3461,12 +3474,14 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"yallist": {
"version": "3.0.2",
"bundled": true,
"dev": true
"dev": true,
"optional": true
}
}
},
......@@ -4448,7 +4463,6 @@
"integrity": "sha512-J9X76xnncMw+wIqb15HeWfPMqPwYxSpPY8yWPJ7rAZN/ZDzFkjCSZObryCyUe8zbrVRNiuCnIeQteCzMn7GnWw==",
"requires": {
"canvg": "1.5.3",
"file-saver": "github:eligrey/FileSaver.js#e865e37af9f9947ddcced76b549e27dc45c1cb2e",
"html2canvas": "1.0.0-alpha.12",
"omggif": "1.0.7",
"promise-polyfill": "8.1.0",
......@@ -4468,6 +4482,10 @@
"base64-arraybuffer": "^0.1.5"
}
},
"file-saver": {
"version": "github:eligrey/FileSaver.js#e865e37af9f9947ddcced76b549e27dc45c1cb2e",
"from": "github:eligrey/FileSaver.js#e865e37af9f9947ddcced76b549e27dc45c1cb2e"
},
"html2canvas": {
"version": "1.0.0-alpha.12",
"resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.0.0-alpha.12.tgz",
......
src/components/yqrange/ads-manage.vue 0 → 100644
浏览文件 @ 84ba7c43
此差异已折叠。
src/components/yqrange/gp-ranking.vue 0 → 100644
浏览文件 @ 84ba7c43
此差异已折叠。
src/utils-o/env-config.js
浏览文件 @ 84ba7c43
......@@ -34,6 +34,7 @@ export const envConfig = {
// reportUrl: 'https://uat-sc-report.yunqueyi.com/',
excelUrl: 'https://uat-file.yunqueyi.com/File/template/portal/',
itemFileUrl: 'http://pica-test-huabei2.oss-cn-beijing.aliyuncs.com/File/template/portal/',
msUrl: 'https://dev-sc.yunqueyi.com/contents/',
},
dev: {
baseUrl: 'https://dev-sc.yunqueyi.com/',
......@@ -51,6 +52,7 @@ export const envConfig = {
reportUrl: 'https://dev-sc-report.yunqueyi.com/',
excelUrl: 'https://test-file.yunqueyi.com/File/template/portal/',
itemFileUrl: 'http://pica-test-huabei2.oss-cn-beijing.aliyuncs.com/File/template/portal/',
msUrl: 'https://dev-sc.yunqueyi.com/contents/',
},
test: {
baseUrl: 'https://test1-sc.yunqueyi.com/',
......@@ -68,6 +70,7 @@ export const envConfig = {
reportUrl: 'https://test1-sc-report.yunqueyi.com/',
excelUrl: 'https://test-file.yunqueyi.com/File/template/portal/',
itemFileUrl: 'http://pica-test-huabei2.oss-cn-beijing.aliyuncs.com/File/template/portal/',
msUrl: 'https://test1-sc.yunqueyi.com/contents/',
},
test2: {
baseUrl: 'https://test2-work.yunqueyi.com/sc/',
......@@ -84,6 +87,7 @@ export const envConfig = {
reportUrl: 'https://test2-sc-report.yunqueyi.com/',
excelUrl: 'https://test-file.yunqueyi.com/File/template/portal/',
itemFileUrl: 'http://pica-test-huabei2.oss-cn-beijing.aliyuncs.com/File/template/portal/',
msUrl: 'https://test2-sc.yunqueyi.com/contents/',
},
uat: {
baseUrl: 'https://uat-sc.yunqueyi.com/',
......@@ -101,6 +105,7 @@ export const envConfig = {
reportUrl: 'https://uat-sc-report.yunqueyi.com/',
excelUrl: 'https://test-file.yunqueyi.com/File/template/portal/',
itemFileUrl: 'http://pica-test-huabei2.oss-cn-beijing.aliyuncs.com/File/template/portal/',
msUrl: 'https://uat-sc.yunqueyi.com/contents/',
},
pro: {
baseUrl: 'https://sc.yunqueyi.com/',
......@@ -118,5 +123,6 @@ export const envConfig = {
reportUrl: 'https://sc-report.yunqueyi.com/',
excelUrl: 'https://file.yunqueyi.com/File/template/portal/',
itemFileUrl: 'http://pica-test-huabei2.oss-cn-beijing.aliyuncs.com/File/template/portal/',
msUrl: 'https://sc.yunqueyi.com/contents/',
}
}
src/utils-o/fetch.js
浏览文件 @ 84ba7c43
......@@ -56,7 +56,7 @@ service.interceptors.request.use(config => {
// console.log('环境变量>>>> ', process.env.BUILD_ENV);
// config.headers['token'] = 'BFD804F3A3194FBBBE113962222839F6';
// config.headers['token'] = 'F8209898391C40A0B8DBC1ED9E157291';
config.headers['token'] = 'F64D5633857D4E16B3C2CCE5E48B0D1E';
config.headers['token'] = '4AA3547FCA3C49528B1429ACACA1508B';
}else{
config.headers['token'] = localStorage.getItem('storageToken')
}
......
src/utils/cme/cmeApi.js
浏览文件 @ 84ba7c43
......@@ -15,6 +15,22 @@ export const getUserTypeReq = (type) => {
})
};
// 获取动态slideBar
export const getSlideData = (req) => {
console.log("getSlideData() : token = " + localStorage.getItem('storageToken') + ", device_ip =" +
localStorage.getItem("ipAddress") + ", browser_ver = " + localStorage.getItem("browser"));
return fetch({
headers,
url: getBaseUrl(`contents/login/menu/list`),
method: 'post',
data: req,
// token: localStorage.getItem('storageToken'),
// system_type: 22,
// device_ip: localStorage.getItem("ipAddress"),
// browser_ver: localStorage.getItem("browser"),
})
};
export const getSelectListReq = (type) => {
return fetch({
url: getBaseUrl(`cme/constants/list?code=${type}`),
......
src/utils/yqrange/yqrangeApi.js
浏览文件 @ 84ba7c43
......@@ -171,4 +171,108 @@ export const getCircleDept = (params) => {
})
};
export const getCircleAds = (params) => {
return fetch({
headers,
url: getBaseUrl(`circle/circle/ad/${params.circleId}`),
method: 'get',
data: params,
description: '查询广告栏位信息',
})
};
export const saveCircleAds = (params) => {
return fetch({
headers,
url: getBaseUrl(`circle/circle/ad/save`),
method: 'post',
data: params,
description: 'B端保存广告栏位信息',
})
};
export const getLinkType = (params) => {
return fetch({
headers,
url: getBaseUrl(`contents/commonComstant/selectByTypeCode?code=${params.code}`),
method: 'get',
data: params,
description: '获取链接类型下拉数据',
})
};
export const getModuleData = (params) => {
return fetch({
headers,
url: getBaseUrl(`contents/moduleConfig/selectName`),
method: 'get',
data: params,
description: '获取模块下拉数据',
})
};
export const getParamData = (params) => {
return fetch({
headers,
url: getBaseUrl(`contents/moduleConfig/selectParam?id=${params.id}`),
method: 'get',
data: params,
description: '获取参数下拉数据',
})
};
export const getRankConfig = (params) => {
return fetch({
headers,
url: getBaseUrl(`circle/rank/config?circleId=${params.circleId}`),
method: 'get',
data: params,
description: '获取排行榜配置',
})
};
export const saveRankConfig = (params) => {
return fetch({
headers,
url: getBaseUrl(`circle/rank/config/save`),
method: 'post',
data: params,
description: '保存排行榜配置'
})
};
export const getGoodsExportUrl = (params) => {
return fetch({
headers,
url: getBaseUrl('store/goods/export'),
method: 'post',
data: params,
description: '商品导出',
})
};
export const getOrdersExportUrl = (params) => {
debugger
return fetch({
headers,
url: getBaseUrl('/store/orders/admin/export'),
method: 'get',
params: params,
description: '导出订单',
})
};
export const getExamAwardList = (params) => {
return fetch({
headers,
url: getBaseUrl(`onlineexam/getExamAwardList`),
method: 'get',
data: params,
description: '获取有奖问答关联考试',
})
};
src/views/goods/create-good.vue
浏览文件 @ 84ba7c43
......@@ -669,6 +669,17 @@
</el-col>
</el-form-item>
</div>
<div class="inline">
<el-form-item label="第三方商品编码" prop="externalGoodsCode">
<el-col :span="20">
<el-input
size="small"
v-model="formData.externalGoodsCode"
placeholder="请输入第三方商品编码"
></el-input>
</el-col>
</el-form-item>
</div>
</div>
</el-form>
......
src/views/goods/goods-manage.vue
浏览文件 @ 84ba7c43
......@@ -33,13 +33,14 @@
</el-col>
</el-row>
<el-row :gutter="30" type="flex" style="margin-top: 10px">
<el-col :span="18">
<el-col :span="12">
<el-button type="primary" size="small" @click="batchOpt('on')">批量上架</el-button>
<el-button type="primary" size="small" @click="batchOpt('off')">批量下架</el-button>
</el-col>
<el-col :span="6" style="text-align: right">
<el-button type="primary" size="small" @click="batchOpt(3)">批量导入</el-button>
<el-col :span="12" style="text-align: right">
<el-button type="primary" size="small" @click="exportOpt">批量导出商品</el-button>
<el-button type="primary" size="small" @click="batchOpt(3)">批量导入商品</el-button>
<el-button type="primary" size="small" @click="edit('add')">新建单个商品</el-button>
</el-col>
</el-row>
......@@ -173,7 +174,7 @@
<script>
import { openLoading, closeLoading } from "../../utils/utils";
import BreadCrumb from "@/components/breadcrumb.vue";
import { getRangeList,updateRangeStatus} from "../../utils/yqrange/yqrangeApi";
import { getRangeList,updateRangeStatus, getGoodsExportUrl, getOrdersExportUrl } from "../../utils/yqrange/yqrangeApi";
import { getGoodsList,batchOnOff,uploadExcel} from '@/utils/goods';
import { getBaseUrl } from '@/utils/index'
var typeList = [{
......@@ -409,7 +410,7 @@
setTimeout(()=>{
this.getLists()
},2000)
}
})
}
......@@ -528,7 +529,6 @@
this.getLists();
},
handleSizeChange(val) {
this.searchForm.pageSize = val;
this.searchForm.pageNo = 1;
......@@ -538,6 +538,17 @@
this.searchForm.pageNo = val;
this.getLists();
},
exportOpt() {
const { goodsIdList, goodsType, goodsName, storeId } = this.searchForm;
getGoodsExportUrl({ goodsIdList, goodsType, goodsName, storeId }).then(res => {
if (res.code != '000000') {
this.$message({ message: res.message, type: 'error' });
return;
}
window.open(res.data);
});
}
},
}
</script>
......
src/views/goods/order-manage.vue
浏览文件 @ 84ba7c43
......@@ -29,6 +29,7 @@
<el-col :span="6" style="text-align: right">
<el-button type="primary" size="small" @click="searchList">查询</el-button>
<el-button type="default" size="small" @click="resetForm" style="margin-left:0;">重置</el-button>
<el-button type="primary" size="small" @click="exportOrder">导出订单</el-button>
</el-col>
</el-row>
</el-form>
......@@ -85,8 +86,8 @@
<div>
<!--<el-button @click="closeTrade(scope.row)" type="text" size="small">关闭交易</el-button>-->
<!--<el-button @click="changePrice(scope.row)" type="text" size="small">修改价格</el-button>-->
<el-button v-if="scope.row.storeType == 1 && scope.row.showStatus == 3" @click="sendGoods(scope.row)" type="text" size="small">发货</el-button>
<el-button v-if="scope.row.storeType == 2 && scope.row.showStatus == 3" @click="distribute(scope.row)" type="text" size="small">配送</el-button>
<el-button v-if="scope.row.storeType == 1 && scope.row.showStatus == 3 && scope.row.refundStatus == 0" @click="sendGoods(scope.row)" type="text" size="small">发货</el-button>
<el-button v-if="scope.row.storeType == 2 && scope.row.showStatus == 3 && scope.row.refundStatus == 0" @click="distribute(scope.row)" type="text" size="small">配送</el-button>
<el-button v-if="scope.row.storeType == 1 && (scope.row.showStatus == 1 || scope.row.showStatus == 2)" @click="viewLogistics(scope.row)" type="text" size="small">查看物流</el-button>
<el-button v-if="scope.row.storeType == 2 && scope.row.showStatus == 2" @click="distributeComplete(scope.row)" type="text" size="small">配送完成</el-button>
<el-button @click="goDetail(scope.row)" type="text" size="small">查看详情</el-button>
......@@ -227,6 +228,15 @@
<el-form-item label="退款金额" prop="name">
<el-input v-model="tuiForm.money" :disabled="true"></el-input>
</el-form-item>
<el-form-item label="退款对象">
<el-select v-model="userType" placeholder="请选择退货对象">
<el-option
v-for="item in userTypes"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="small" type="primary" @click="confirmTui">完成</el-button>
......@@ -238,6 +248,7 @@
// import { openLoading, closeLoading } from "../../utils/utils";
import BreadCrumb from "@/components/breadcrumb.vue";
import SendSetDialog from "@/components/shop/send-set-dialog";
import { getOrdersExportUrl } from "@/utils/yqrange/yqrangeApi";
import { queryOrderList, updateExpress, refundApply } from "@/utils/shop";
import { toDecimal2 } from '@/utils';
......@@ -307,10 +318,22 @@
value: 2,
disabled: true
}
],
userType: "", // 1.开单医生, 2.支付用户
userTypes: [
{
label: '开单医生',
value: 1,
},
{
label: '支付用户',
value: 2,
},
]
}
},
created() {
console.log("order created() : enter");
this.searchForm.storeId = this.$route.query.storeId || 0,
this.searchList();
},
......@@ -479,7 +502,7 @@
this.showTuiDialog = true;
},
confirmTui() {
refundApply({ orderId: this.tuiForm.order.id }).then(res => {
refundApply({ orderId: this.tuiForm.order.id, userType: this.userType }).then(res => {
if (res.code == '000000') {
this.$message.success('操作成功');
this.showTuiDialog = false;
......@@ -489,6 +512,17 @@
}
});
},
exportOrder() {
const { goodsName, orderNo, receiver, orderDate, storeId } = this.searchForm;
getOrdersExportUrl({ goodsName, orderNo, receiver, orderDate, storeId }).then(res => {
if (res.code != '000000') {
this.$message({ message: res.message, type: 'error' });
return;
}
window.open(res.data);
});
}
},
filters: {
toFixed2: function (value) {
......
src/views/layout/slidebar.vue
浏览文件 @ 84ba7c43
此差异已折叠。
src/views/shop/create-shop.vue
浏览文件 @ 84ba7c43
......@@ -705,6 +705,7 @@
// adminList:this.formData.adminList,
// }
this.formData.storeType = Number(this.formData.storeType);
this.formData.storeEntry = 'PCKAIDIAN'; // 添加店铺渠道
console.log('提交的数据',this.formData)
saveStore(this.formData).then(res => {
if (res.code == '000000') {
......
src/views/yqrange/create-live.vue
浏览文件 @ 84ba7c43
......@@ -404,6 +404,26 @@
<!--<p class="upload-message" v-if="uploadImgMessage2">请选择直播封面</p>-->
</div>
<el-form-item label="是否显示有奖问答tab" v-if="idType == 1">
<el-radio-group v-model="formData.qa" size="small" @change="changeTab">
<el-radio :label="0">否</el-radio>
<el-radio :label="1">是</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="有奖问答关联考试" v-if="idType == 1 && formData.qa == 1" class="required-label">
<el-col :span="18">
<el-select filterable v-model="formData.qaId" placeholder="请选择有奖问答关联考试" style="width:88%">
<el-option
v-for="item2 in examAwardList"
:key="item2.id"
:label="item2.name"
:value="item2.id">
</el-option>
</el-select>
</el-col>
</el-form-item>
<el-form-item label="直播角色" v-if="formData.streamType == 1">
<div style="color:#666666;font-size:10px;">主播（必填）</div>
......@@ -571,7 +591,7 @@
import { isEmptyUtils, openLoading, closeLoading } from "../../utils/utils";
import { doUpload, getFilePath, unsubscribe} from "../../utils/qiniu-util";
import { checkMobile } from '../../utils/patients/checkValid';
import { getRtcInfo, getImages, searchDoc} from "../../utils/yqrange/yqrangeApi";
import { getRtcInfo, getImages, searchDoc, getExamAwardList} from "../../utils/yqrange/yqrangeApi";
import Cropper from '@/components/common/cropper.vue';
import SearchDoctor from "@/components/yqrange/search-doctor";
// import { ossUpload, getFilePathForOSS } from "@/utils/oss/ossUtil";
......@@ -670,8 +690,11 @@
}],
isSign: 0,
signMinute: "",
isAppPush: 0
isAppPush: 0,
qa:0,
qaId: ""
},
examAwardList: [],
checked: false,
signFlag: false,
tabFlag: "0",
......@@ -679,6 +702,7 @@
backgroundImageUrlTemp: "",
backgroundImages: [],
backgroundImageUrl: "",
introTextNum: 0,
rtcIntroducesText:[],
rtcIntroducesImages: [],
......@@ -716,14 +740,15 @@
oriUrl: '', // 原图
},
cropperIndex: "",
nowInput: 0,
idType: "",
pickerOptions0: {
disabledDate: time => {
// 在科学计数法中，为了使公式简便，可以用带“E”的格式表示。例如1.03乘10的8次方，可简写为“1.03e8”的形式
// 一天是24*60*60*1000 = 86400000 = 8.64e7
// console.log('this.maxDate',this.maxDate)
return time.getTime() < Date.now() - 8.64e7
},
nowInput: 0
}
},
rules: {
name: [
......@@ -807,7 +832,8 @@
vm = this;
// 区分内部用户和外部用户
let idType = localStorage.getItem('storageIdType');
this.idType = localStorage.getItem('storageIdType');
// this.idType = 1; // TODO
this.circleId = this.$route.query.circleId;
this.circleName = this.$route.query.circleName;
this.curmbSecond = "圈子管理-" + this.circleName;
......@@ -828,6 +854,7 @@
this.curmbThird = "编辑直播";
this.initRtcInfo(this.rtcId);
}
this.getExamAwardList();
},
methods: {
......@@ -922,6 +949,33 @@
// this.$message.warning('正在上传，请稍等')
// }
},
getExamAwardList(){
let req = null;
getExamAwardList(req).then(function (res) {
if(res.code == "000000") {
vm.examAwardList = res.data;
// vm.formData = res.data;
}
}).catch(function (error) {
vm.$message.error(error);
});
},
checkQaId(){
if(vm.formData.qa == 1 && (vm.formData.qaId == null || vm.formData.qaId == "")){
vm.$message.error("请选择有奖问答关联考试！");
return false;
}
else {
return true;
}
},
//上传直播简介
beforeUploadPic1(file) {
vm.cropperIndex = 10;
......@@ -1805,6 +1859,17 @@
if(!this.checkTab()){
return;
}
// 内部运营人员
if(this.idType == 1){
// 检查有奖问答关联考试
if(!this.checkQaId()){
return;
}
if(this.formData.qa == 0){
this.formData.qaId = null;
}
}
// 校验嘉宾姓名和手机号
if(!this.checkGuests()){
......
src/views/yqrange/range-manage.vue
浏览文件 @ 84ba7c43
......@@ -21,6 +21,12 @@
<el-tab-pane label="应用配置" name="fourth">
<range-setting></range-setting>
</el-tab-pane>
<el-tab-pane label="广告位管理" name="five" v-if="idType == 1">
<ads-manage></ads-manage>
</el-tab-pane>
<el-tab-pane label="排行榜管理" name="six" v-if="idType == 1">
<gp-ranking></gp-ranking>
</el-tab-pane>
</el-tabs>
</div>
<div v-if="active == 4">
......@@ -39,8 +45,12 @@ import { getRangeList,updateRangeStatus, getCircleSettingList, saveCircleSetting
import LiveManage from "./live-manage";
import RangeSetting from "./range-setting";
import Mebman from "../../components/yqrange/mebman";
import AdsManage from "../../components/yqrange/ads-manage";
import GpRanking from "../../components/yqrange/gp-ranking";
export default {
components: {
GpRanking,
AdsManage,
Mebman,
RangeSetting,
LiveManage,
......@@ -71,11 +81,14 @@ export default {
circleId: null,
name: "",
active: 0,
roleType: ''
roleType: '',
idType: ''
}
},
created() {
const {id, name, activeName, roleType} = this.$route.query;
this.idType = localStorage.getItem('storageIdType');
// this.idType = 1;// TODO
this.circleId = id;
this.name = name;
this.activeName = activeName;
......
src/views/yqrange/range-setting.vue
浏览文件 @ 84ba7c43
......@@ -86,7 +86,9 @@ export default {
if(res.code == "000000") {
this.settingForm.settingData = res.data;
} else {
// this.$message.error(res.data.message);
this.settingForm.settingData = [];
}
if(this.settingForm.settingData == [] || this.settingForm.settingData.length == 0){
......@@ -106,9 +108,14 @@ export default {
{
appTag: 4,
showOff: 1
},
{
appTag: 5,
showOff: 0
}];
}
for(let i = 0; i < this.settingForm.settingData.length; i++){
if(this.settingForm.settingData[i].appTag == 1){
this.settingForm.settingData[i].appTagName = "教培"
......@@ -122,9 +129,11 @@ export default {
else if(this.settingForm.settingData[i].appTag == 4){
this.settingForm.settingData[i].appTagName = "职称培训"
}
else if(this.settingForm.settingData[i].appTag == 5){
this.settingForm.settingData[i].appTagName = "云鹊豆商城"
}
}
}).catch((error) => {
this.$message.error("请重试");
})
......
src/views/yqrange/yq-range.vue
浏览文件 @ 84ba7c43
......@@ -167,7 +167,8 @@ export default {
settingForm:{
circleId: null,
settingData: []
}
},
idType: ""
}
},
created() {
......@@ -179,21 +180,21 @@ export default {
tabChangeHandler(tab) {},
initPrivilege(){
let idType = localStorage.getItem('storageIdType');
this.idType = localStorage.getItem('storageIdType');
// if(idType == null || idType == ""){
// idType = 2;
// localStorage.setItem('storageIdType', idType);
// }
this.searchForm.userType = idType;
this.searchForm.userType = this.idType;
// 内部用户:运营人员
if(idType == "1"){
if(this.idType == "1"){
this.showAllFlag = true;
this.showNewFlag = true;
this.showApplyFlag = true;
}
// 外部用户
else if(idType == "2"){
else if(this.idType == "2"){
this.showAllFlag = false;
setTimeout(() => {
this.getUserAuth();
......@@ -355,7 +356,7 @@ export default {
id: row.id,
name: row.name,
activeName: 'first',
roleType: row.roleId
roleType: row.roleId,
}
})
},
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或