-
-
-
- 
-
-
-
-
-
-
-
-
-
-
-
-
- 轻纺城小学红色网上游主题教育馆
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+ 轻纺城小学红色网上游主题教育馆
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -68,7 +68,7 @@ import ServiceListThird from '@/views/Service/component/ServiceListThird.vue'
import ServiceListFour from '@/views/Service/component/ServiceListFour.vue'
import Screen from '@/views/Service/component/Screen.vue'
export default {
- props:[
+ props: [
'centerNo'
],
data () {
@@ -78,7 +78,7 @@ export default {
top_tab_active: 0,
active: 1,
uniList: [],
- weekList:[],
+ weekList: [],
cityList: [],
selectList: [],
riverList: [],
@@ -86,13 +86,13 @@ export default {
campList: [],
}
},
- watch: {
+ watch: {
$route: {
immediate: true,
handler () {
// 设置tabbar状态
this.tabName = this.$route.query.showTab || 'KQ'
- document.title = this.$route.query.showTab == 'ZZY' ? '周周营': '柯桥研学'
+ document.title = this.$route.query.showTab == 'ZZY' ? '周周营' : '柯桥研学'
}
}
},
@@ -106,7 +106,7 @@ export default {
this.initService()
},
methods: {
- initService(){
+ initService () {
this.getUniList()
this.getWeekList()
this.getCityList()
@@ -118,155 +118,239 @@ export default {
// 革命遗址
getUniList () {
this.$toast.loading()
- this.yxAxios.post(`${this.yanxueUrl}/api/StudiesWap/SpecialCourse/List`, {
- "userId": this.centerNo,
- "businessTypeId": "BQ0001",
- "productTypeId": "BQ0001",
- "province": "",
- "city": "",
- "area": "",
- "channelCode": "",
- "searchType": 5
- }).then((res) => {
- this.$toast.clear()
- // console.log(res.data.data)
- let uniList = res.data.data;
- // let uniList = [...res.data.data,...res.data.data,...res.data.data,...res.data.data,...res.data.data,...res.data.data,...res.data.data];
- for (let i in uniList) {
- uniList[i].course_labels = uniList[i].course_labels?.split(',');
- if (uniList[i].startDate) {
- uniList[i].week = this.formatWeek(this.Moment(uniList[i].startDate).format('d'));
- uniList[i].startDate = this.Moment(uniList[i].startDate).format('YYYY.M.D');
- uniList[i].endDate = this.Moment(uniList[i].endDate).format('YYYY.M.D');
+ this.mgop({
+ api: 'mgop.sz.hswsy.qxyList', // 必须
+ host: 'https://mapi.zjzwfw.gov.cn/',
+ dataType: 'JSON',
+ type: 'POST',
+ appKey: 'fuxgnukl+2001895516+edccpx', // 必须
+ headers: {
+ // 'isTestUrl': '1'
+ },
+ data: {
+ "area": "",
+ "province": "",
+ "city": "",
+ "searchType": "5",
+ "userId": this.centerNo,
+ "productTypeId": "BQ0001",
+ "businessTypeId": "BQ0001",
+ "channelCode": ""
+ },
+ onSuccess: data => {
+ console.log('data', data)
+ this.$toast.clear()
+ let uniList = data.data.data;
+ for (let i in uniList) {
+ uniList[i].course_labels = uniList[i].course_labels?.split(',');
+ if (uniList[i].startDate) {
+ uniList[i].week = this.formatWeek(this.Moment(uniList[i].startDate).format('d'));
+ uniList[i].startDate = this.Moment(uniList[i].startDate).format('YYYY.M.D');
+ uniList[i].endDate = this.Moment(uniList[i].endDate).format('YYYY.M.D');
+ }
}
+ this.uniList = uniList
+ },
+ onFail: err => {
+ console.log('err', err)
}
- this.uniList = uniList
- })
+ });
},
// 文化传承
getWeekList () {
- this.yxAxios.post(`${this.yanxueUrl}/api/StudiesWap/SpecialCourse/List`, {
- "userId": this.centerNo,
- "businessTypeId": "BQ0001",
- "productTypeId": "BQ0002",
- "province": "",
- "city": "",
- "area": "",
- "channelCode": "",
- "searchType": 5
- }).then((res) => {
- let weekList = res.data.data;
- // let weekList = [...res.data.data,...res.data.data,...res.data.data,...res.data.data,...res.data.data,...res.data.data,...res.data.data];
- for (let i in weekList) {
- weekList[i].course_labels = weekList[i].course_labels?.split(',');
- if (weekList[i].startDate) {
- weekList[i].week = this.formatWeek(this.Moment(weekList[i].startDate).format('d'));
- weekList[i].startDate = this.Moment(weekList[i].startDate).format('YYYY.M.D');
- weekList[i].endDate = this.Moment(weekList[i].endDate).format('YYYY.M.D');
+ this.mgop({
+ api: 'mgop.sz.hswsy.qxyList', // 必须
+ host: 'https://mapi.zjzwfw.gov.cn/',
+ dataType: 'JSON',
+ type: 'POST',
+ appKey: 'fuxgnukl+2001895516+edccpx', // 必须
+ headers: {
+ // 'isTestUrl': '1'
+ },
+ data: {
+ "area": "",
+ "province": "",
+ "city": "",
+ "searchType": "5",
+ "userId": this.centerNo,
+ "productTypeId": "BQ0002",
+ "businessTypeId": "BQ0001",
+ "channelCode": ""
+ },
+ onSuccess: data => {
+ console.log('data', data)
+ let weekList = data.data.data;
+ for (let i in weekList) {
+ weekList[i].course_labels = weekList[i].course_labels?.split(',');
+ if (weekList[i].startDate) {
+ weekList[i].week = this.formatWeek(this.Moment(weekList[i].startDate).format('d'));
+ weekList[i].startDate = this.Moment(weekList[i].startDate).format('YYYY.M.D');
+ weekList[i].endDate = this.Moment(weekList[i].endDate).format('YYYY.M.D');
+ }
}
+ this.weekList = weekList
+ },
+ onFail: err => {
+ console.log('err', err)
}
- this.weekList = weekList
- })
+ });
},
// 红色军旅
getCityList () {
- this.yxAxios.post(`${this.yanxueUrl}/api/StudiesWap/SpecialCourse/List`, {
- "userId": this.centerNo,
- "businessTypeId": "BQ0001",
- "productTypeId": "BQ0003",
- "province": "",
- "city": "",
- "area": "",
- "channelCode": "",
- "searchType": 5
- }).then((res) => {
- let cityList = res.data.data;
- // let cityList = [...res.data.data,...res.data.data,...res.data.data,...res.data.data,...res.data.data,...res.data.data,...res.data.data];
- for (let i in cityList) {
- cityList[i].course_labels = cityList[i].course_labels?.split(',');
- if (cityList[i].startDate) {
- cityList[i].week = this.formatWeek(this.Moment(cityList[i].startDate).format('d'));
- cityList[i].startDate = this.Moment(cityList[i].startDate).format('YYYY.M.D');
- cityList[i].endDate = this.Moment(cityList[i].endDate).format('YYYY.M.D');
+ this.mgop({
+ api: 'mgop.sz.hswsy.qxyList', // 必须
+ host: 'https://mapi.zjzwfw.gov.cn/',
+ dataType: 'JSON',
+ type: 'POST',
+ appKey: 'fuxgnukl+2001895516+edccpx', // 必须
+ headers: {
+ // 'isTestUrl': '1'
+ },
+ data: {
+ "area": "",
+ "province": "",
+ "city": "",
+ "searchType": "5",
+ "userId": this.centerNo,
+ "productTypeId": "BQ0003",
+ "businessTypeId": "BQ0001",
+ "channelCode": ""
+ },
+ onSuccess: data => {
+ console.log('data', data)
+ let cityList = data.data.data;
+ for (let i in cityList) {
+ cityList[i].course_labels = cityList[i].course_labels?.split(',');
+ if (cityList[i].startDate) {
+ cityList[i].week = this.formatWeek(this.Moment(cityList[i].startDate).format('d'));
+ cityList[i].startDate = this.Moment(cityList[i].startDate).format('YYYY.M.D');
+ cityList[i].endDate = this.Moment(cityList[i].endDate).format('YYYY.M.D');
+ }
}
+ this.cityList = cityList
+ },
+ onFail: err => {
+ console.log('err', err)
}
- this.cityList = cityList
- })
+ });
},
// 乡村振新
getSelectList () {
- this.yxAxios.post(`${this.yanxueUrl}/api/StudiesWap/SpecialCourse/List`, {
- "userId": this.centerNo,
- "businessTypeId": "BQ0001",
- "productTypeId": "BQ0004",
- "province": "",
- "city": "",
- "area": "",
- "channelCode": "",
- "searchType": 5
- }).then((res) => {
- let selectList = res.data.data;
- // let selectList = [...res.data.data,...res.data.data,...res.data.data,...res.data.data,...res.data.data,...res.data.data,...res.data.data];
- for (let i in selectList) {
- selectList[i].course_labels = selectList[i].course_labels?.split(',');
- if (selectList[i].startDate) {
- selectList[i].week = this.formatWeek(this.Moment(selectList[i].startDate).format('d'));
- selectList[i].startDate = this.Moment(selectList[i].startDate).format('YYYY.M.D');
- selectList[i].endDate = this.Moment(selectList[i].endDate).format('YYYY.M.D');
+ this.mgop({
+ api: 'mgop.sz.hswsy.qxyList', // 必须
+ host: 'https://mapi.zjzwfw.gov.cn/',
+ dataType: 'JSON',
+ type: 'POST',
+ appKey: 'fuxgnukl+2001895516+edccpx', // 必须
+ headers: {
+ // 'isTestUrl': '1'
+ },
+ data: {
+ "area": "",
+ "province": "",
+ "city": "",
+ "searchType": "5",
+ "userId": this.centerNo,
+ "productTypeId": "BQ0004",
+ "businessTypeId": "BQ0001",
+ "channelCode": ""
+ },
+ onSuccess: data => {
+ console.log('data', data)
+ let selectList = data.data.data;
+ for (let i in selectList) {
+ selectList[i].course_labels = selectList[i].course_labels?.split(',');
+ if (selectList[i].startDate) {
+ selectList[i].week = this.formatWeek(this.Moment(selectList[i].startDate).format('d'));
+ selectList[i].startDate = this.Moment(selectList[i].startDate).format('YYYY.M.D');
+ selectList[i].endDate = this.Moment(selectList[i].endDate).format('YYYY.M.D');
+ }
}
+ this.selectList = selectList
+ },
+ onFail: err => {
+ console.log('err', err)
}
- this.selectList = selectList
- })
+ });
},
// 大好河山
getRiverList () {
- this.yxAxios.post(`${this.yanxueUrl}/api/StudiesWap/SpecialCourse/List`, {
- "userId": this.centerNo,
- "businessTypeId": "BQ0001",
- "productTypeId": "BQ0005",
- "province": "",
- "city": "",
- "area": "",
- "channelCode": "",
- "searchType": 5
- }).then((res) => {
- let riverList = res.data.data;
- for (let i in riverList) {
- riverList[i].course_labels = riverList[i].course_labels?.split(',');
- if (riverList[i].startDate) {
- riverList[i].week = this.formatWeek(this.Moment(riverList[i].startDate).format('d'));
- riverList[i].startDate = this.Moment(riverList[i].startDate).format('YYYY.M.D');
- riverList[i].endDate = this.Moment(riverList[i].endDate).format('YYYY.M.D');
+ this.mgop({
+ api: 'mgop.sz.hswsy.qxyList', // 必须
+ host: 'https://mapi.zjzwfw.gov.cn/',
+ dataType: 'JSON',
+ type: 'POST',
+ appKey: 'fuxgnukl+2001895516+edccpx', // 必须
+ headers: {
+ // 'isTestUrl': '1'
+ },
+ data: {
+ "area": "",
+ "province": "",
+ "city": "",
+ "searchType": "5",
+ "userId": this.centerNo,
+ "productTypeId": "BQ0005",
+ "businessTypeId": "BQ0001",
+ "channelCode": ""
+ },
+ onSuccess: data => {
+ console.log('data', data)
+ let riverList = data.data.data;
+ for (let i in riverList) {
+ riverList[i].course_labels = riverList[i].course_labels?.split(',');
+ if (riverList[i].startDate) {
+ riverList[i].week = this.formatWeek(this.Moment(riverList[i].startDate).format('d'));
+ riverList[i].startDate = this.Moment(riverList[i].startDate).format('YYYY.M.D');
+ riverList[i].endDate = this.Moment(riverList[i].endDate).format('YYYY.M.D');
+ }
}
+ this.riverList = riverList
+ },
+ onFail: err => {
+ console.log('err', err)
}
- this.riverList = riverList
- })
+ });
},
-
- // 每周一营 6
+
+ // 每周一营 6
getCampList () {
- this.yxAxios.post(`${this.yanxueUrl}/api/StudiesWap/SpecialCourse/List`, {
- "userId": this.centerNo,
- "businessTypeId": "JY0004",
- "productTypeId": "ZZY001",
- "province": "",
- "city": "",
- "area": "",
- "channelCode": "GZH002",
- "searchType": 6
- }).then((res) => {
- let campList = res.data.data;
- // let campList = [...res.data.data,...res.data.data,...res.data.data,...res.data.data,...res.data.data,...res.data.data,...res.data.data];
- for (let i in campList) {
- campList[i].course_labels = campList[i].course_labels?.split(',');
- if (campList[i].startDate) {
- campList[i].week = this.formatWeek(this.Moment(campList[i].startDate).format('d'));
- campList[i].startDate = this.Moment(campList[i].startDate).format('YYYY.M.D');
- campList[i].endDate = this.Moment(campList[i].endDate).format('YYYY.M.D');
+ this.mgop({
+ api: 'mgop.sz.hswsy.qxyList', // 必须
+ host: 'https://mapi.zjzwfw.gov.cn/',
+ dataType: 'JSON',
+ type: 'POST',
+ appKey: 'fuxgnukl+2001895516+edccpx', // 必须
+ headers: {
+ // 'isTestUrl': '1'
+ },
+ data: {
+ "area": "",
+ "province": "",
+ "city": "",
+ "searchType": "6",
+ "userId": this.centerNo,
+ "productTypeId": "ZZY001",
+ "businessTypeId": "JY0004",
+ "channelCode": "GZH002"
+ },
+ onSuccess: data => {
+ console.log('data', data)
+ let campList = data.data.data;
+ for (let i in campList) {
+ campList[i].course_labels = campList[i].course_labels?.split(',');
+ if (campList[i].startDate) {
+ campList[i].week = this.formatWeek(this.Moment(campList[i].startDate).format('d'));
+ campList[i].startDate = this.Moment(campList[i].startDate).format('YYYY.M.D');
+ campList[i].endDate = this.Moment(campList[i].endDate).format('YYYY.M.D');
+ }
}
+ this.campList = campList
+ },
+ onFail: err => {
+ console.log('err', err)
}
- this.campList = campList
- })
+ });
},
beforeChange (index) {
// if (index != 0 && index != 1 && index != 2) {
@@ -279,18 +363,14 @@ export default {
this.$toast('暂未开放，敬请期待！')
},
// 我的订单
- handleMyOrder(){
- this.$router.push({ name: 'ServiceOrderPublic' })
+ handleMyOrder () {
+ this.$router.push({ name: 'ServiceOrderXST' })
},
// 我的优惠券
- handleMyCard(){
+ handleMyCard () {
this.$router.push({ name: 'ServiceCardBoxPublic' })
},
- // 个人信息
- handleMyClass(){
- this.$router.push({ name: 'privateXST' })
- },
- formatWeek(week){
+ formatWeek (week) {
return week == 1 ? '周一' : week == 2 ? '周二' : week == 3 ? '周三' : week == 4 ? '周四' : week == 5 ? '周五' : week == 6 ? '周六' : week == 0 ? '周日' : '';
},
// 点击轮播
@@ -315,9 +395,9 @@ export default {
background: #f8f8f8;
overflow: hidden;
.swipeDiv {
- // height: 400px;
- height: 60vw;
- width: 100%;
+ // height: 400px;
+ height: 60vw;
+ width: 100%;
}
.container {
height: 100%;
@@ -338,11 +418,16 @@ export default {
justify-content: center;
color: #fff;
// background-color: aquamarine;
- background-image: linear-gradient(to right, rgba(255,0,0,0), #FF696A, rgba(255,0,0,0));
+ background-image: linear-gradient(
+ to right,
+ rgba(255, 0, 0, 0),
+ #ff696a,
+ rgba(255, 0, 0, 0)
+ );
background-color: #fff;
}
.tabsCard {
- width: 100vw;
+ width: 100vw;
}
.top_tool {
display: flex;
@@ -381,7 +466,7 @@ export default {
background: rgba(255, 255, 255, 0.24);
&.active {
// color: #fff;
- color:black;
+ color: black;
background: rgba(255, 255, 255, 0.21);
}
}
@@ -407,14 +492,14 @@ export default {
}
}
- /deep/.van-search__content {
+ ::v-deep .van-search__content {
background: rgba(255, 255, 255, 0.36);
.van-cell {
- // color: #fff;
- color: black;
+ // color: #fff;
+ color: black;
}
.van-field__control {
- // color: #fff;
+ // color: #fff;
color: black;
&::-webkit-input-placeholder {
// color: #fff;
@@ -422,26 +507,26 @@ export default {
}
}
}
- /deep/.van-tabs__wrap {
+ ::v-deep .van-tabs__wrap {
box-shadow: 0 10px 10px rgba(238, 238, 238, 0.295);
height: 88px;
}
- /deep/.van-tabs__nav {
+ ::v-deep .van-tabs__nav {
background: transparent;
}
- /deep/.van-tab {
+ ::v-deep .van-tab {
// color: #fff;
color: black;
font-size: 28px;
background-color: #fff;
}
- /deep/.van-tab--active {
+ ::v-deep .van-tab--active {
// color: #fff;
color: black;
font-size: 32px;
font-weight: bold;
}
- /deep/.van-tabs__line {
+ ::v-deep .van-tabs__line {
width: 48px;
height: 6px;
// background: #ffffff;
@@ -457,11 +542,11 @@ export default {
transform: scale(1.2);
}
}
- .fixed_btn{
+ .fixed_btn {
position: fixed;
bottom: 20vw;
right: 0;
- span{
+ span {
display: block;
width: 200px;
text-align: center;
@@ -475,12 +560,12 @@ export default {
}
}
.my-swipe .van-swipe-item {
- color: #fff;
- height: 60vw;
- font-size: 20px;
- // line-height: 400px;
- // line-height: 60vw;
- text-align: center;
- background-color: #39a9ed;
- }
+ color: #fff;
+ height: 60vw;
+ font-size: 20px;
+ // line-height: 400px;
+ // line-height: 60vw;
+ text-align: center;
+ background-color: #39a9ed;
+}
diff --git a/src/views/PublicService/ServiceKQ.vue b/src/views/PublicService/ServiceKQ.vue
index a282cef..a55b170 100644
--- a/src/views/PublicService/ServiceKQ.vue
+++ b/src/views/PublicService/ServiceKQ.vue
@@ -23,12 +23,11 @@ export default {
},
methods: {
checkAuth () {
- let centerNo = this.$route.query.center_no || sessionStorage.getItem('centerNo');
+ let centerNo = this.common.getUrlParam('center_no') || sessionStorage.getItem('centerNo');
if (centerNo) {
- alert('获取到centerNo,不跳登录')
- console.log('获取到centerNo,不跳登录')
this.centerNo = centerNo
sessionStorage.setItem('centerNo', centerNo);
+ this.getUserInfo()
} else {
const sUserAgent = window.navigator.userAgent.toLowerCase()
const dtdreamweb = sUserAgent.indexOf("dtdreamweb") > -1
@@ -37,16 +36,43 @@ export default {
alert('浙里办')
window.location.href = `https://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=hswsy`;
}
- else if (miniprogram) {
- alert('支付宝')
- // window.location.href = `https://puser.zjzwfw.gov.cn/sso/alipay.do?action=ssoLogin&servicecode=passp&goto=`;
- }
- else{
- alert('非浙里办或支付宝渠道访问')
+ // else if (miniprogram) {
+ // alert('支付宝')
+ // window.location.href = `https://puser.zjzwfw.gov.cn/sso/alipay.do?action=ssoLogin&servicecode=passp&goto=`;
+ // }
+ else {
+ console.log('非浙里办渠道访问，显示测试用户数据')
+ this.centerNo = '20210930160466993660'
+ sessionStorage.setItem('centerNo', '20210930160466993660');
+ this.getUserInfo()
}
}
},
-
+ // 获取用户信息
+ getUserInfo: function () {
+ this.mgop({
+ api: 'mgop.sz.hswsy.getPortalUserByNum', // 必须
+ host: 'https://mapi.zjzwfw.gov.cn/',
+ dataType: 'JSON',
+ type: 'GET',
+ appKey: 'fuxgnukl+2001895516+edccpx', // 必须
+ headers: {
+ // 'isTestUrl': '1'
+ },
+ data: {
+ "userNum": this.centerNo
+ },
+ onSuccess: res => {
+ console.log('getUserInfo', res)
+ if (res.data.code == 200) {
+ sessionStorage.setItem('userInfo', JSON.stringify(res.data.data.userInfo))
+ }
+ },
+ onFail: err => {
+ console.log('err', err)
+ }
+ });
+ },
},
components: {
ServiceBasekq
diff --git a/src/views/PublicService/ServiceOrderXST.vue b/src/views/PublicService/ServiceOrderXST.vue
index 373f149..b60e2fb 100644
--- a/src/views/PublicService/ServiceOrderXST.vue
+++ b/src/views/PublicService/ServiceOrderXST.vue
@@ -232,7 +232,7 @@ export default {
this.userInfo = JSON.parse(userInfo);
}
// 进入页面进到第几个tab
- if (this.$route.query.active||this.$route.query.active==0) {
+ if (this.$route.query.active || this.$route.query.active == 0) {
this.active = this.$route.query.active
}
// 进入页面直接显示第一个订单的群码
@@ -261,73 +261,143 @@ export default {
},
//获取待支付
onLoadpay () {
- const centerNo = this.userInfo?.centerNo;
- if (!centerNo) return;
- this.yxAxios.get(`${this.yanxueUrl}/api/StudiesWap/GetOrderPayList?userId=${centerNo}&type=1&page=1&pageSize=999`).then((res) => {
- let data = res.data;
- if (data.status == 1) {
- this.paylist = this.paylist.concat(data.data.list);
- this.loading = false;
- if (data.data.list.length < 10) {
+ this.mgop({
+ api: 'mgop.sz.hswsy.GetOrderPayList', // 必须
+ host: 'https://mapi.zjzwfw.gov.cn/',
+ dataType: 'JSON',
+ type: 'GET',
+ appKey: 'fuxgnukl+2001895516+edccpx', // 必须
+ headers: {
+ // 'isTestUrl': '1'
+ },
+ data: {
+ "userId": sessionStorage.getItem('centerNo'),
+ "type": 1,
+ "page": 1,
+ "pageSize": 999
+ },
+ onSuccess: res => {
+ console.log('待支付:', res)
+ if (res.data.status == 1) {
+ this.paylist = res.data.data.list;
+ this.loading = false;
this.finished = true;
+ } else {
+ this.$toast.fail(res.data.message);
}
- } else {
- this.$toast.fail(data.message);
+ },
+ onFail: err => {
+ console.log('err', err)
}
- })
+ });
},
//获取已支付
onLoadmove () {
- const centerNo = this.userInfo?.centerNo;
- this.yxAxios.get(`${this.yanxueUrl}/api/StudiesWap/GetOrderPayList?userId=${centerNo}&type=2&page=1&pageSize=999`).then((res) => {
- let data = res.data;
- if (data.status == 1) {
- this.movelist = this.movelist.concat(data.data.list);
- this.loading = false;
- if (data.data.list.length < 10) {
+ this.mgop({
+ api: 'mgop.sz.hswsy.GetOrderPayList', // 必须
+ host: 'https://mapi.zjzwfw.gov.cn/',
+ dataType: 'JSON',
+ type: 'GET',
+ appKey: 'fuxgnukl+2001895516+edccpx', // 必须
+ headers: {
+ // 'isTestUrl': '1'
+ },
+ data: {
+ "userId": sessionStorage.getItem('centerNo'),
+ "type": 2,
+ "page": 1,
+ "pageSize": 999
+ },
+ onSuccess: res => {
+ console.log('已支付:', res)
+ if (res.data.status == 1) {
+ this.movelist = res.data.data.list;
+ this.loading = false;
this.finished = true;
+ if (this.showChatGroupUrlTag) {
+ this.showChatGroupUrlTag = false;
+ this.openGroupCodePopup(0)
+ }
+ } else {
+ this.$toast.fail(res.data.message);
}
- if (this.showChatGroupUrlTag) {
- this.showChatGroupUrlTag = false;
- this.openGroupCodePopup(0)
- }
- } else {
- this.$toast.fail(data.message);
+ },
+ onFail: err => {
+ console.log('err', err)
}
- })
+ });
},
//获取待评价
onLoadCareer () {
- const centerNo = this.userInfo?.centerNo;
- this.yxAxios.get(`${this.yanxueUrl}/api/StudiesWap/GetOrderPayList?userId=${centerNo}&type=3&page=1&pageSize=999`).then((res) => {
- let data = res.data;
- if (data.status == 1) {
- this.datalist = this.datalist.concat(data.data.list);
- this.loading = false;
- if (data.data.list.length < 10) {
+ this.mgop({
+ api: 'mgop.sz.hswsy.GetOrderPayList', // 必须
+ host: 'https://mapi.zjzwfw.gov.cn/',
+ dataType: 'JSON',
+ type: 'GET',
+ appKey: 'fuxgnukl+2001895516+edccpx', // 必须
+ headers: {
+ // 'isTestUrl': '1'
+ },
+ data: {
+ "userId": sessionStorage.getItem('centerNo'),
+ "type": 3,
+ "page": 1,
+ "pageSize": 999
+ },
+ onSuccess: res => {
+ console.log('待评价:', res)
+ if (res.data.status == 1) {
+ this.datalist = res.data.data.list;
+ this.loading = false;
this.finished = true;
+ if (this.showChatGroupUrlTag) {
+ this.showChatGroupUrlTag = false;
+ this.openGroupCodePopup(0)
+ }
+ } else {
+ this.$toast.fail(res.data.message);
}
- } else {
- this.$toast.fail(data.message);
+ },
+ onFail: err => {
+ console.log('err', err)
}
- })
+ });
},
//获取已评价
onLoad () {
- const centerNo = this.userInfo?.centerNo;
- this.yxAxios.get(`${this.yanxueUrl}/api/StudiesWap/GetOrderPayList?userId=${centerNo}&type=4&page=1&pageSize=999`).then((res) => {
- // console.log(res)
- let data = res.data;
- if (data.status == 1) {
- this.list = this.list.concat(data.data.list);
- this.loading = false;
- if (data.data.list.length < 10) {
+ this.mgop({
+ api: 'mgop.sz.hswsy.GetOrderPayList', // 必须
+ host: 'https://mapi.zjzwfw.gov.cn/',
+ dataType: 'JSON',
+ type: 'GET',
+ appKey: 'fuxgnukl+2001895516+edccpx', // 必须
+ headers: {
+ // 'isTestUrl': '1'
+ },
+ data: {
+ "userId": sessionStorage.getItem('centerNo'),
+ "type": 4,
+ "page": 1,
+ "pageSize": 999
+ },
+ onSuccess: res => {
+ console.log('已评价:', res)
+ if (res.data.status == 1) {
+ this.list = res.data.data.list;
+ this.loading = false;
this.finished = true;
+ if (this.showChatGroupUrlTag) {
+ this.showChatGroupUrlTag = false;
+ this.openGroupCodePopup(0)
+ }
+ } else {
+ this.$toast.fail(res.data.message);
}
- } else {
- this.$toast.fail(data.message);
+ },
+ onFail: err => {
+ console.log('err', err)
}
- })
+ });
},
//生成核销码
makeCode (id) {
diff --git a/src/views/PublicService/component/PrefectBox.vue b/src/views/PublicService/component/PrefectBox.vue
index d535026..a1b3c0d 100644
--- a/src/views/PublicService/component/PrefectBox.vue
+++ b/src/views/PublicService/component/PrefectBox.vue
@@ -373,12 +373,12 @@ export default {
}
}
}
-/deep/.van-search {
+::v-deep .van-search {
background: transparent;
padding: 0;
width: 100%;
}
-/deep/.van-search__content {
+::v-deep .van-search__content {
padding: 0;
}
.schoolBoxF {
diff --git a/src/views/PublicService/component/chooseSchool.vue b/src/views/PublicService/component/chooseSchool.vue
index bb977fa..b32af3e 100644
--- a/src/views/PublicService/component/chooseSchool.vue
+++ b/src/views/PublicService/component/chooseSchool.vue
@@ -1,102 +1,112 @@
/*选择学校*/
-
-
-
-
-
+
\ No newline at end of file
diff --git a/src/views/PublicService/privateXST.vue b/src/views/PublicService/privateXST.vue
index 0186165..d8949d2 100644
--- a/src/views/PublicService/privateXST.vue
+++ b/src/views/PublicService/privateXST.vue
@@ -351,12 +351,12 @@ export default {
}
}
}
-/deep/.van-search {
+::v-deep .van-search {
background: transparent;
padding: 0;
width: 100%;
}
-/deep/.van-search__content {
+::v-deep .van-search__content {
padding: 0;
}
diff --git a/src/views/Service/AbroadDetail.vue b/src/views/Service/AbroadDetail.vue
index d664a6b..e23f6c7 100644
--- a/src/views/Service/AbroadDetail.vue
+++ b/src/views/Service/AbroadDetail.vue
@@ -1036,7 +1036,7 @@ export default {
}
.top_border {
border-top: 16px solid #f6f7fa;
- /deep/.van-tab {
+ ::v-deep .van-tab {
.van-tab__text {
font-size: 34px !important;
}
diff --git a/src/views/Service/CheckOrder.vue b/src/views/Service/CheckOrder.vue
index 5bd0105..949cfb0 100644
--- a/src/views/Service/CheckOrder.vue
+++ b/src/views/Service/CheckOrder.vue
@@ -452,10 +452,10 @@ export default {
}
}
}
-/deep/.van-calendar__bottom-info {
+::v-deep .van-calendar__bottom-info {
color: #f95555;
}
-/deep/.van-calendar__selected-day {
+::v-deep .van-calendar__selected-day {
background: #ecf2fc !important;
border: 4px solid #79abff;
box-sizing: border-box;
diff --git a/src/views/Service/DatePackage.vue b/src/views/Service/DatePackage.vue
index 61a3bfe..857a24e 100644
--- a/src/views/Service/DatePackage.vue
+++ b/src/views/Service/DatePackage.vue
@@ -373,10 +373,10 @@ export default {
}
}
}
-/deep/.van-calendar__bottom-info {
+::v-deep .van-calendar__bottom-info {
color: #f95555;
}
-/deep/.van-calendar__selected-day {
+::v-deep .van-calendar__selected-day {
background: #ecf2fc !important;
border: 4px solid #79abff;
box-sizing: border-box;
diff --git a/src/views/Service/SelectContact.vue b/src/views/Service/SelectContact.vue
index 01a9733..b9fc2f9 100644
--- a/src/views/Service/SelectContact.vue
+++ b/src/views/Service/SelectContact.vue
@@ -49,23 +49,39 @@ export default {
duration: 0,
forbidClick: true
})
- const userInfo = JSON.parse(sessionStorage.getItem('userInfo'))
- this.yxAxios.get(`${this.proxyUrl}/prod/user/info/getPortalUserByNum?userNum=${userInfo.centerNo}`).then((res) => {
- this.$toast.clear()
- if (res.data.code == 200) {
- let userInfo = res.data.data.userInfo;
- let contactList = userInfo.subUsers
- contactList.unshift({
- travelerMobile: userInfo?.phone,
- travelerNum: userInfo?.centerNo,
- travelerIdCard: userInfo?.idCard,
- userType: 2,
- travelerName: userInfo?.nickName,
- gender: userInfo?.gender,
- })
- this.contactList = contactList
+ this.mgop({
+ api: 'mgop.sz.hswsy.getPortalUserByNum', // 必须
+ host: 'https://mapi.zjzwfw.gov.cn/',
+ dataType: 'JSON',
+ type: 'GET',
+ appKey: 'fuxgnukl+2001895516+edccpx', // 必须
+ headers: {
+ // 'isTestUrl': '1'
+ },
+ data: {
+ "userNum": sessionStorage.getItem('centerNo')
+ },
+ onSuccess: data => {
+ console.log('联系人列表：', data)
+ if (data.data.code == 200) {
+ let userInfo = res.data.data.userInfo;
+ let contactList = userInfo.subUsers
+ // 把家长添加到列表
+ contactList.unshift({
+ travelerMobile: userInfo?.phone,
+ travelerNum: userInfo?.centerNo,
+ travelerIdCard: userInfo?.idCard,
+ userType: 2,
+ travelerName: userInfo?.nickName,
+ gender: userInfo?.gender,
+ })
+ this.contactList = contactList
+ }
+ },
+ onFail: err => {
+ console.log('err', err)
}
- })
+ });
},
// 修改联系人
editContact (index) {
@@ -90,7 +106,7 @@ export default {
let selectedArr = [];
for (let i in contactList) {
if (contactList[i]?.checked) {
- if ((!contactList[i].travelerIdCard||!contactList[i].gender) && !this.hideParent) {
+ if ((!contactList[i].travelerIdCard || !contactList[i].gender) && !this.hideParent) {
this.$toast('请先完善您选择的联系人信息')
return;
} else {
@@ -116,7 +132,7 @@ export default {
Dialog.alert({
title: '温馨提示',
message: '活动参与主体为学生本人，请选择出行学生！未绑定学生，请新增出行学生进行添加。',
- confirmButtonColor:'#3385FF'
+ confirmButtonColor: '#3385FF'
})
}
}
--
libgit2 0.21.0