From b20f0a9f0497631280fbb0a047bb888087fe2859 Mon Sep 17 00:00:00 2001 From: yanghao <781521347@qq.com> Date: Mon, 14 Mar 2022 16:38:49 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9C=81=E8=89=BA=E6=9C=AF=E5=8D=8F=E4=BC=9A?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=9C=80=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 390 +---- api/home.js | 25 +- app.css | 151 -- assets/css/base.less | 10 +- assets/css/style.less | 2 +- components/CustomNavigator.vue | 89 -- components/colorui/components/cu-custom.vue | 6 +- components/colorui/main.css | 6 +- config/index.js | 4 +- manifest.json | 9 +- pages.json | 51 +- pages/Loading/index.vue | 22 +- pages/activity/detail/index.vue | 39 - pages/activity/index.vue | 20 - pages/activity/signIn/confirm/index.css | 82 - pages/activity/signIn/confirm/index.vue | 57 +- pages/activity/signIn/index.vue | 58 +- pages/authorization/index.vue | 8 +- pages/demandHall/business/index.vue | 1382 +++++++++-------- pages/demandHall/companyDetail/index.css | 2 +- pages/demandHall/companyDetail/index.vue | 19 +- pages/demandHall/createProject/index.css | 4 +- pages/demandHall/createProject/index.vue | 4 +- pages/demandHall/demoInvestment/index.vue | 2 +- pages/demandHall/enterpriseServer/index.vue | 36 +- pages/demandHall/index.css | 322 ---- pages/demandHall/index.vue | 4 +- pages/demandHall/needsContact/index.css | 2 +- pages/demandHall/needsContact/index.vue | 12 +- pages/demandHall/needsDetail/index.css | 198 --- pages/demandHall/needsDetail/index.vue | 2 +- pages/demandHall/newProject/index.vue | 2 +- pages/demandHall/projectDetail/index.vue | 4 +- pages/demandHall/projectManage/index.vue | 2 +- pages/demandHall/resourcesContact/index.css | 2 +- pages/demandHall/resourcesContact/index.vue | 2 +- pages/demandHall/resourcesDetail/index.css | 2 +- pages/demandHall/resourcesDetail/index.vue | 2 +- pages/demandHall/supplyHall/index.vue | 41 +- pages/home/activityCenter/index.vue | 30 +- pages/home/activityDetail/index.vue | 163 ++ pages/home/components/activateList.vue | 133 ++ pages/home/components/expertList.vue | 77 + pages/home/components/tabNav.vue | 88 ++ pages/home/index.css | 382 ----- pages/home/index.vue | 1230 ++------------- .../components/informationList.vue | 94 ++ pages/information/index.vue | 632 ++------ pages/life/addGoods/index.vue | 6 +- pages/life/articleDetail/index.vue | 33 +- pages/life/goodsDetails/index.vue | 2 +- pages/life/index.css | 1 - pages/life/index.vue | 1144 +++++++------- pages/life/learnMore/index.vue | 141 +- pages/life/temp/index.vue | 6 +- pages/life/tempList/index.vue | 2 +- pages/life/yunInfo/index.vue | 2 +- pages/order/MyOrder/index.vue | 6 +- pages/release/companyAuth/index.css | 6 +- pages/release/companyAuth/index.vue | 23 +- pages/release/index.vue | 8 +- pages/release/perfectCompanyInfo/index.css | 86 - pages/release/perfectCompanyInfo/index.vue | 4 +- pages/release/perfectPersonInfo/index.css | 100 -- pages/release/perfectPersonInfo/index.vue | 4 +- pages/release/personAuth/index.css | 2 - pages/release/personAuth/index.vue | 3 - pages/shop/ShoppingCart/index.vue | 11 +- pages/user/addServiceCode/index.vue | 2 +- pages/user/agreement/index.css | 47 - pages/user/agreement/index.vue | 14 +- pages/user/completeData/index.css | 134 -- pages/user/completeData/index.vue | 12 +- pages/user/editNeeds/index.css | 113 -- pages/user/editNeeds/index.vue | 9 +- pages/user/goodsManage/index.vue | 8 +- pages/user/incomeDetail/index.css | 118 -- pages/user/incomeDetail/index.vue | 2 +- pages/user/index.css | 170 -- pages/user/index.vue | 291 ++-- pages/user/mine/index.css | 293 ---- pages/user/mine/index.vue | 14 +- pages/user/myShop/index.vue | 4 +- pages/user/needsManage/index.css | 116 -- pages/user/needsManage/index.vue | 8 +- pages/user/needsOrder/index.css | 66 - pages/user/needsOrder/index.vue | 2 +- pages/user/openStore/index.vue | 2 +- pages/user/orderManage/index.vue | 10 +- pages/user/pay/index.css | 15 - pages/user/personalData/index.css | 130 -- pages/user/personalData/index.vue | 11 +- pages/user/profession/index.css | 6 - pages/user/resourcesManage/index.css | 114 -- pages/user/resourcesManage/index.vue | 8 +- pages/user/resourcesOrder/index.css | 6 +- pages/user/resourcesOrder/index.vue | 6 +- pages/user/sendGoods/index.vue | 2 +- pages/user/withdraw/index.vue | 2 +- static/images/address.png | Bin 0 -> 620 bytes static/images/business-news.png | Bin 3621 -> 2345 bytes static/images/business-title1.png | Bin 3847 -> 0 bytes static/images/business-title2.png | Bin 3917 -> 0 bytes static/images/business-title3.png | Bin 3940 -> 0 bytes static/images/cart.png | Bin 1292 -> 937 bytes static/images/gongxu-bg.png | Bin 0 -> 4723 bytes static/images/price.png | Bin 0 -> 532 bytes static/images/qiye-bg.png | Bin 0 -> 2735 bytes static/images/rec-icon1.png | Bin 1709 -> 1067 bytes static/images/rec-icon2.png | Bin 2613 -> 2186 bytes static/images/search-icon.png | Bin 1186 -> 866 bytes static/images/time.png | Bin 0 -> 438 bytes static/images/update-icon.png | Bin 873 -> 596 bytes static/images/user/business.png | Bin 3773 -> 1726 bytes static/images/user/dfh.png | Bin 0 -> 711 bytes static/images/user/dfk.png | Bin 0 -> 668 bytes static/images/user/dpj.png | Bin 0 -> 755 bytes static/images/user/fbsp.png | Bin 0 -> 1118 bytes static/images/user/fuwu1.png | Bin 1826 -> 0 bytes static/images/user/fuwu2.png | Bin 1649 -> 0 bytes static/images/user/fuwu3.png | Bin 1805 -> 0 bytes static/images/user/fuwu4.png | Bin 2155 -> 0 bytes static/images/user/fuwu5.png | Bin 1764 -> 0 bytes static/images/user/fuwu6.png | Bin 1681 -> 0 bytes static/images/user/fuwu7.png | Bin 1839 -> 0 bytes static/images/user/fuwu8.png | Bin 1561 -> 0 bytes static/images/user/person.png | Bin 3755 -> 1572 bytes static/images/user/sh.png | Bin 0 -> 1728 bytes static/images/user/sjdd.png | Bin 0 -> 951 bytes static/images/user/spgl.png | Bin 0 -> 1067 bytes static/images/user/wykd.png | Bin 0 -> 1124 bytes static/images/user/xuqiu1.png | Bin 1642 -> 1733 bytes static/images/user/xuqiu2.png | Bin 1503 -> 1556 bytes static/images/user/xuqiu3.png | Bin 1397 -> 1020 bytes static/images/user/xuqiu4.png | Bin 1728 -> 1250 bytes static/images/user/yfh.png | Bin 0 -> 1059 bytes static/tabbarComponent/icon/home-a.png | Bin 1284 -> 0 bytes static/tabbarComponent/icon/home.png | Bin 1214 -> 0 bytes static/tabbarComponent/icon/tab1-a.png | Bin 0 -> 784 bytes static/tabbarComponent/icon/tab1.png | Bin 0 -> 878 bytes static/tabbarComponent/icon/tab2-a.png | Bin 1625 -> 986 bytes static/tabbarComponent/icon/tab2.png | Bin 1362 -> 1097 bytes static/tabbarComponent/icon/tab3-a.png | Bin 1925 -> 790 bytes static/tabbarComponent/icon/tab3.png | Bin 1609 -> 889 bytes static/tabbarComponent/icon/tab4-a.png | Bin 1967 -> 408 bytes static/tabbarComponent/icon/tab4.png | Bin 1236 -> 430 bytes static/tabbarComponent/icon/tab5-a.png | Bin 141 -> 1085 bytes static/tabbarComponent/icon/tab5.png | Bin 338 -> 1174 bytes utils/util.js | 32 +- 149 files changed, 2827 insertions(+), 6434 deletions(-) delete mode 100644 app.css delete mode 100644 components/CustomNavigator.vue delete mode 100644 pages/activity/signIn/confirm/index.css delete mode 100644 pages/demandHall/index.css delete mode 100644 pages/demandHall/needsDetail/index.css create mode 100644 pages/home/activityDetail/index.vue create mode 100644 pages/home/components/activateList.vue create mode 100644 pages/home/components/expertList.vue create mode 100644 pages/home/components/tabNav.vue delete mode 100644 pages/home/index.css create mode 100644 pages/information/components/informationList.vue delete mode 100644 pages/life/index.css delete mode 100644 pages/release/perfectCompanyInfo/index.css delete mode 100644 pages/release/perfectPersonInfo/index.css delete mode 100644 pages/release/personAuth/index.css delete mode 100644 pages/user/agreement/index.css delete mode 100644 pages/user/completeData/index.css delete mode 100644 pages/user/editNeeds/index.css delete mode 100644 pages/user/incomeDetail/index.css delete mode 100644 pages/user/index.css delete mode 100644 pages/user/mine/index.css delete mode 100644 pages/user/needsManage/index.css delete mode 100644 pages/user/needsOrder/index.css delete mode 100644 pages/user/pay/index.css delete mode 100644 pages/user/personalData/index.css delete mode 100644 pages/user/profession/index.css delete mode 100644 pages/user/resourcesManage/index.css create mode 100644 static/images/address.png delete mode 100644 static/images/business-title1.png delete mode 100644 static/images/business-title2.png delete mode 100644 static/images/business-title3.png create mode 100644 static/images/gongxu-bg.png create mode 100644 static/images/price.png create mode 100644 static/images/qiye-bg.png create mode 100644 static/images/time.png create mode 100644 static/images/user/dfh.png create mode 100644 static/images/user/dfk.png create mode 100644 static/images/user/dpj.png create mode 100644 static/images/user/fbsp.png delete mode 100644 static/images/user/fuwu1.png delete mode 100644 static/images/user/fuwu2.png delete mode 100644 static/images/user/fuwu3.png delete mode 100644 static/images/user/fuwu4.png delete mode 100644 static/images/user/fuwu5.png delete mode 100644 static/images/user/fuwu6.png delete mode 100644 static/images/user/fuwu7.png delete mode 100644 static/images/user/fuwu8.png create mode 100644 static/images/user/sh.png create mode 100644 static/images/user/sjdd.png create mode 100644 static/images/user/spgl.png create mode 100644 static/images/user/wykd.png create mode 100644 static/images/user/yfh.png delete mode 100644 static/tabbarComponent/icon/home-a.png delete mode 100644 static/tabbarComponent/icon/home.png create mode 100644 static/tabbarComponent/icon/tab1-a.png create mode 100644 static/tabbarComponent/icon/tab1.png diff --git a/App.vue b/App.vue index 0e40d43..c5b5728 100644 --- a/App.vue +++ b/App.vue @@ -2,21 +2,17 @@ import { VUE_APP_API_URL } from "@/config"; +import Vue from 'vue' export default { onLaunch: function (e) { var that = this; //获取设备信息 - this.setMenuHeight(); + this.setAppInfo(); this.autoUpdate(); // uni.hideTabBar() }, globalData: { baseURL: VUE_APP_API_URL+ '/', userInfo: null, - navHeight: 0, - navTopHeight: 0, - menuTop: 0, - menuHeight: 0, - CustomBar: 0, isIphoneX: false, inviterId: null, //分享码 @@ -54,157 +50,6 @@ export default { }, methods: { - sceneInfo(s) { - console.log(s,'sssssssssssss') - var scene = []; - switch (s) { - case 1001: - scene.push(s, "发现栏小程序主入口"); - break; - case 1005: - scene.push(s, "顶部搜索框的搜索结果页"); - break; - case 1006: - scene.push(s, "发现栏小程序主入口搜索框的搜索结果页"); - break; - case 1007: - scene.push(s, "单人聊天会话中的小程序消息卡片"); - break; - case 1008: - scene.push(s, "群聊会话中的小程序消息卡片"); - break; - case 1011: - scene.push(s, "扫描二维码"); - break; - case 1012: - scene.push(s, "长按图片识别二维码"); - break; - case 1014: - scene.push(s, "手机相册选取二维码"); - break; - case 1017: - scene.push(s, "前往体验版的入口页"); - break; - case 1019: - scene.push(s, "微信钱包"); - break; - case 1020: - scene.push(s, "公众号profile页相关小程序列表"); - break; - case 1022: - scene.push(s, "聊天顶部置顶小程序入口"); - break; - case 1023: - scene.push(s, "安卓系统桌面图标"); - break; - case 1024: - scene.push(s, "小程序profile页"); - break; - case 1025: - scene.push(s, "扫描一维码"); - break; - case 1026: - scene.push(s, "附近小程序列表"); - break; - case 1027: - scene.push(s, "顶部搜索框搜索结果页“使用过的小程序”列表"); - break; - case 1028: - scene.push(s, "我的卡包"); - break; - case 1029: - scene.push(s, "卡券详情页"); - break; - case 1031: - scene.push(s, "长按图片识别一维码"); - break; - case 1032: - scene.push(s, "手机相册选取一维码"); - break; - case 1034: - scene.push(s, "微信支付完成页"); - break; - case 1035: - scene.push(s, "公众号自定义菜单"); - break; - case 1036: - scene.push(s, "App分享消息卡片"); - break; - case 1037: - scene.push(s, "小程序打开小程序"); - break; - case 1038: - scene.push(s, "从另一个小程序返回"); - break; - case 1039: - scene.push(s, "摇电视"); - break; - case 1042: - scene.push(s, "添加好友搜索框的搜索结果页"); - break; - case 1044: - scene.push(s, "带shareTicket的小程序消息卡片"); - break; - case 1047: - scene.push(s, "扫描小程序码"); - break; - case 1048: - scene.push(s, "长按图片识别小程序码"); - break; - case 1049: - scene.push(s, "手机相册选取小程序码"); - break; - case 1052: - scene.push(s, "卡券的适用门店列表"); - break; - case 1053: - scene.push(s, "搜一搜的结果页"); - break; - case 1054: - scene.push(s, "顶部搜索框小程序快捷入口"); - break; - case 1056: - scene.push(s, "音乐播放器菜单"); - break; - case 1058: - scene.push(s, "公众号文章"); - break; - case 1059: - scene.push(s, "体验版小程序绑定邀请页"); - break; - case 1064: - scene.push(s, "微信连Wifi状态栏"); - break; - case 1067: - scene.push(s, "公众号文章广告"); - break; - case 1068: - scene.push(s, "附近小程序列表广告"); - break; - case 1072: - scene.push(s, "二维码收款页面"); - break; - case 1073: - scene.push(s, "客服消息列表下发的小程序消息卡片"); - break; - case 1074: - scene.push(s, "公众号会话下发的小程序消息卡片"); - break; - case 1089: - scene.push(s, "微信聊天主界面下拉"); - break; - case 1090: - scene.push(s, "长按小程序右上角菜单唤出最近使用历史"); - break; - case 1092: - scene.push(s, "城市服务入口"); - break; - default: - scene.push("未知入口"); - break; - } - return scene; - }, autoUpdate: function () { // console.log(new Date()); var self = this; // 获取小程序更新机制兼容 @@ -245,54 +90,36 @@ export default { } }, - setMenuHeight() { - uni.getSystemInfo({ - success: res => { - console.log(res,'resaaaaa') - this.globalData.navTopHeight = res.statusBarHeight; - this.globalData.CustomBar = res.statusBarHeight + 45; - this.globalData.systemInfo = res; - let model = res.model; - if (/iphone\sx/i.test(model) || /iphone/i.test(model) && /unknown/.test(model) || /iphone\s11/i.test(model) || /iphone\s12/i.test(model) || /iphone\s13/i.test(model)) { - this.globalData.isIphoneX = true; - } - } - }); - let menuButtonObj = uni.getMenuButtonBoundingClientRect(); - console.log(menuButtonObj,'menuButtonObj') - this.globalData.menuTop = menuButtonObj.top; - this.globalData.menuHeight = menuButtonObj.height; - this.globalData.topHeight = menuButtonObj.top + menuButtonObj.height; - this.globalData.navHeight = menuButtonObj.top; - }, + // 获取系统栏高度 + async setAppInfo() { + let that = this + return new Promise((resolve, reject) => { + uni.getSystemInfo({ + success: function (e) { + Vue.prototype.StatusBar = e.statusBarHeight + // #ifdef H5 + Vue.prototype.CustomBar = e.statusBarHeight + 45 + // #endif - getInfo() { - this.http('get', 'userinfo').then(res => { - if (res.data.success) { - uni.setStorageSync('userInfo', res.data.data); - var pages = getCurrentPages().pop(); //当前页面 + // #ifdef APP-PLUS + if (e.platform == 'android') { + Vue.prototype.CustomBar = e.statusBarHeight + 50 + } else { + Vue.prototype.CustomBar = e.statusBarHeight + 45 + } + // #endif - if (pages.getUser) { - pages.getUser(); - } - } else { - uni.showToast({ - title: res.data.msg, - icon: 'none', - duration: 2000 - }); - setTimeout(() => { - // uni.navigateTo({ - // url: '/pages/login/index' - // }); - uni.navigateTo({ - url: '/pages/authorization/index' - }); - }, 2000); - } - }); + // #ifdef MP-WEIXIN + let custom = wx.getMenuButtonBoundingClientRect() + Vue.prototype.Custom = custom + Vue.prototype.CustomBar = custom.bottom + custom.top - e.statusBarHeight + // #endif + }, + }) + }) }, + http(mathods, url, params) { var that = this; var header = { @@ -316,10 +143,6 @@ export default { uni.hideLoading(); // console.log(res) //判断token是否过期 res.data.code == 40001 if (!res.data.success && res.data.status == 401) { - // console.log('登陆失效') - // uni.navigateTo({ - // url: '/pages/login/index' - // }); var pages = getCurrentPages().pop(); //当前页面 console.log(pages.$page.fullPath) uni.setStorageSync('redirect',pages.$page.fullPath) //当前路由存起来，用于登录后自动跳转 @@ -353,158 +176,35 @@ export default { @import './assets/css/base.less'; @import './assets/css/reset.less'; @import './assets/css/style.less'; -view, -scroll-view, -swiper, -button, -input, -textarea, -label, -navigator, -image { - -webkit-box-sizing: border-box; - box-sizing: border-box; -} -image{ - /* border-radius: 8rpx; */ -} -/* layout */ -.acea-row-nowrap { - display: flex; - /* 辅助类 */ -} -.acea-row { - display: flex; - flex-wrap: wrap; - /* 辅助类 */ -} -.acea-row.row-middle,.acea-row-nowrap.row-middle{ - align-items: center; -} -.acea-row.row-top,.acea-row-nowrap.row-top { - align-items: flex-start; -} -.acea-row.row-bottom { - align-items: flex-end; -} -.acea-row.row-center,.acea-row-nowrap.row-center { - justify-content: center; -} -.acea-row.row-right,.acea-row-nowrap.row-right { - justify-content: flex-end; -} -.acea-row.row-left,.acea-row-nowrap.row-left { - justify-content: flex-start; -} -.acea-row.row-between,.acea-row-nowrap.row-between { - justify-content: space-between; -} -.acea-row.row-around, .acea-row-nowrap.row-around{ - justify-content: space-around; -} -.acea-row.row-column-around,.acea-row-nowrap.row-column-around { - flex-direction: column; - justify-content: space-around; -} -.acea-row.row-column { - flex-direction: column; -} -.acea-row.row-column-between,.acea-row-nowrap.row-column-between { - flex-direction: column; - justify-content: space-between; -} -/* 上下左右垂直居中 */ -.acea-row.row-center-wrapper,.acea-row-nowrap.row-center-wrapper { - align-items: center; - justify-content: center; -} -/* 上下两边居中对齐 */ -.acea-row.row-between-wrapper,.acea-row-nowrap.row-between-wrapper { - align-items: center; - justify-content: space-between; -} -.line1{ - overflow:hidden; - text-overflow:ellipsis; - white-space:nowrap; - width: 100%; -} -.line2{ - word-break:break-all; - display:-webkit-box; - -webkit-line-clamp:2; - -webkit-box-orient:vertical; - overflow:hidden; -} - -.back-btn{ - width: 36rpx; - height: 36rpx; - position: fixed; - left: 40rpx; - text-align: center; - line-height: 36rpx; - z-index: 99; -} -.back-btn image{ - width: 100%; - height: 100%; -} - - -radio .wx-radio-input.wx-radio-input-checked { - border-color: #FF5100; - background: #FF5100; +radio .wx-radio-input.wx-radio-input-checked, +checkbox .wx-checkbox-input.wx-checkbox-input-checked +{ + border-color: #1d1d1d; + background: #1d1d1d; } radio .wx-radio-input { - height: 33rpx; - width: 33rpx; - margin-top: -4rpx; + height: 32rpx; + width: 32rpx; + margin-top: -4rpx !important; border-radius: 50%; border: 2rpx solid #999; background: transparent; } -radio .wx-radio-input.wx-radio-input-checked::before { +radio .wx-radio-input.wx-radio-input-checked::before, +checkbox .wx-checkbox-input.wx-checkbox-input-checked::before{ border-radius: 50%; /* 圆角 */ - width: 35rpx; /* 选中后对勾大小，不要超过背景的尺寸 */ - height: 35rpx; /* 选中后对勾大小，不要超过背景的尺寸 */ - line-height: 35rpx; + width: 32rpx; /* 选中后对勾大小，不要超过背景的尺寸 */ + height: 32rpx; /* 选中后对勾大小，不要超过背景的尺寸 */ + line-height: 32rpx; text-align: center; - font-size: 28rpx; /* 对勾大小 30rpx */ + font-size: 26rpx; /* 对勾大小 30rpx */ color: #fff; /* 对勾颜色 白色 */ - background: #FF5100; - border: 2rpx solid #FF5100; + background: #1d1d1d; + border: 2rpx solid #1d1d1d; transform: translate(-50%, -50%) scale(1); -webkit-transform: translate(-50%, -50%) scale(1); } - -checkbox .wx-checkbox-input.wx-checkbox-input-checked { - border-color: #F99C10; - background: #F99C10; -} -checkbox .wx-checkbox-input { - height: 40rpx; - width: 40rpx; - margin-top: -4rpx; - border-radius: 50%; - border: 2rpx solid #999; - background: transparent; -} -checkbox .wx-checkbox-input.wx-checkbox-input-checked::before { - border-radius: 50%; /* 圆角 */ - width: 40rpx; /* 选中后对勾大小，不要超过背景的尺寸 */ - height: 40rpx; /* 选中后对勾大小，不要超过背景的尺寸 */ - line-height: 40rpx; - text-align: center; - font-size: 28rpx; /* 对勾大小 30rpx */ - color: #fff; /* 对勾颜色 白色 */ - background: #F99C10; - border: 2rpx solid #F99C10; - transform: translate(-50%, -50%) scale(1); - -webkit-transform: translate(-50%, -50%) scale(1); -} - .no-list{ display: flex; flex-direction: column; @@ -523,7 +223,7 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before { height: 88rpx; line-height: 88rpx; text-align: center; - background: linear-gradient(134deg, #FFA782 0%, #FF6D31 100%); + background: #000; border-radius: 44rpx; font-size: 40rpx; color: #fff; diff --git a/api/home.js b/api/home.js index c9f0ea3..76866a5 100644 --- a/api/home.js +++ b/api/home.js @@ -20,4 +20,27 @@ export function getArticle(q) { * */ export function getArticleDetail(q) { return request.get("/article/details/" + q.id); -} \ No newline at end of file +} + +/* + * 活动列表 + * */ +export function getActivityList(data) { + return request.post("/activity/activityList",data); +} +/* + * 活动列表 + * */ +export function getActivityInfo(data) { + return request.get("/activity/activityInfo/" + data); +} + +/* + * 专家列表 + * */ +export function getListExperts(data) { + return request.get("/expert/listExperts", data); +} + + + \ No newline at end of file diff --git a/app.css b/app.css deleted file mode 100644 index fc290e7..0000000 --- a/app.css +++ /dev/null @@ -1,151 +0,0 @@ -/**app.wxss**/ -view, -scroll-view, -swiper, -button, -input, -textarea, -label, -navigator, -image { - -webkit-box-sizing: border-box; - box-sizing: border-box; -} -image{ - /* border-radius: 8rpx; */ -} -/* layout */ -.acea-row-nowrap { - display: flex; - /* 辅助类 */ -} -.acea-row { - display: flex; - flex-wrap: wrap; - /* 辅助类 */ -} -.acea-row.row-middle,.acea-row-nowrap.row-middle{ - align-items: center; -} -.acea-row.row-top,.acea-row-nowrap.row-top { - align-items: flex-start; -} -.acea-row.row-bottom { - align-items: flex-end; -} -.acea-row.row-center,.acea-row-nowrap.row-center { - justify-content: center; -} -.acea-row.row-right,.acea-row-nowrap.row-right { - justify-content: flex-end; -} -.acea-row.row-left,.acea-row-nowrap.row-left { - justify-content: flex-start; -} -.acea-row.row-between,.acea-row-nowrap.row-between { - justify-content: space-between; -} -.acea-row.row-around, .acea-row-nowrap.row-around{ - justify-content: space-around; -} -.acea-row.row-column-around,.acea-row-nowrap.row-column-around { - flex-direction: column; - justify-content: space-around; -} -.acea-row.row-column { - flex-direction: column; -} -.acea-row.row-column-between,.acea-row-nowrap.row-column-between { - flex-direction: column; - justify-content: space-between; -} -/* 上下左右垂直居中 */ -.acea-row.row-center-wrapper,.acea-row-nowrap.row-center-wrapper { - align-items: center; - justify-content: center; -} -/* 上下两边居中对齐 */ -.acea-row.row-between-wrapper,.acea-row-nowrap.row-between-wrapper { - align-items: center; - justify-content: space-between; -} -.line1{ - overflow:hidden; - text-overflow:ellipsis; - white-space:nowrap; - width: 100%; -} -.line2{ - word-break:break-all; - display:-webkit-box; - -webkit-line-clamp:2; - -webkit-box-orient:vertical; - overflow:hidden; -} - -.back-btn{ - width: 36rpx; - height: 36rpx; - position: fixed; - left: 40rpx; - text-align: center; - line-height: 36rpx; - z-index: 99; -} -.back-btn image{ - width: 100%; - height: 100%; -} - - - -radio .wx-radio-input.wx-radio-input-checked { - border-color: #cc0000; - background: #cc0000; -} -radio .wx-radio-input { - height: 33rpx; - width: 33rpx; - margin-top: -4rpx; - border-radius: 50%; - border: 2rpx solid #999; - background: transparent; -} -radio .wx-radio-input.wx-radio-input-checked::before { - border-radius: 50%; /* 圆角 */ - width: 35rpx; /* 选中后对勾大小，不要超过背景的尺寸 */ - height: 35rpx; /* 选中后对勾大小，不要超过背景的尺寸 */ - line-height: 35rpx; - text-align: center; - font-size: 28rpx; /* 对勾大小 30rpx */ - color: #fff; /* 对勾颜色 白色 */ - background: #FF5100; - border: 2rpx solid #FF5100; - transform: translate(-50%, -50%) scale(1); - -webkit-transform: translate(-50%, -50%) scale(1); -} - -.no-list{ - display: flex; - flex-direction: column; - align-items: center; - font-size: 46rpx; - color: #D8D8D8; - font-weight: 500; - padding-top: 20%; -} -.no-list image{ - width: 536rpx; - height: 490rpx; -} -.no-list .to-btn{ - width: 458rpx; - height: 88rpx; - line-height: 88rpx; - text-align: center; - background: linear-gradient(134deg, #FFA782 0%, #FF6D31 100%); - border-radius: 44rpx; - font-size: 40rpx; - color: #fff; - margin-top: 160rpx; -} diff --git a/assets/css/base.less b/assets/css/base.less index 76017af..08c5433 100644 --- a/assets/css/base.less +++ b/assets/css/base.less @@ -4,17 +4,17 @@ */ .font-color-red { - color: #F99C10 !important; + color: #292929 !important; } .bg-color-red { - background-color: #F99C10 !important; + background-color: #292929 !important; } .icon-color { - color: #F99C10; + color: #292929; } .cart-color { - color: #F99C10 !important; - border: 1px solid #F99C10 !important; + color: #292929 !important; + border: 1px solid #292929 !important; } /* padding20 */ .padding20 { diff --git a/assets/css/style.less b/assets/css/style.less index 7f0b7a9..91d22c4 100644 --- a/assets/css/style.less +++ b/assets/css/style.less @@ -11,7 +11,7 @@ image { } page { - // background: #f5f5f5; + background: #f5f5f5; height: 100%; } diff --git a/components/CustomNavigator.vue b/components/CustomNavigator.vue deleted file mode 100644 index 16d69b4..0000000 --- a/components/CustomNavigator.vue +++ /dev/null @@ -1,89 +0,0 @@ - - - - - diff --git a/components/colorui/components/cu-custom.vue b/components/colorui/components/cu-custom.vue index 0a79594..d2db612 100644 --- a/components/colorui/components/cu-custom.vue +++ b/components/colorui/components/cu-custom.vue @@ -37,7 +37,7 @@ props: { bgColor: { type: String, - default: '' + default: '#fff' }, isBack: { type: [Boolean, String], @@ -59,12 +59,14 @@ diff --git a/components/colorui/main.css b/components/colorui/main.css index f14df9b..69dc7b1 100644 --- a/components/colorui/main.css +++ b/components/colorui/main.css @@ -10,7 +10,7 @@ 初始化 ==================== */ body { - background-color: #f1f1f1; + background-color: #fff; font-size: 28upx; color: #333333; font-family: Helvetica Neue, Helvetica, sans-serif; @@ -132,8 +132,8 @@ switch.checked::before { /* #ifndef MP-ALIPAY */ radio::before, checkbox::before { - font-family: "cuIcon"; - content: "\e645"; + /* font-family: "cuIcon"; */ + /* content: "\e645"; */ position: absolute; color: #ffffff !important; top: 50%; diff --git a/config/index.js b/config/index.js index 6a93295..2ec013e 100644 --- a/config/index.js +++ b/config/index.js @@ -1,8 +1,8 @@ // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api'; // export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api' // export const VUE_APP_API_URL = 'http://192.168.0.112:8092/api' - // export const VUE_APP_API_URL = 'http://192.168.68.126:8092/api' -export const VUE_APP_API_URL = 'https://cloud.api.cyjyyjy.com/api' + // export const VUE_APP_API_URL = 'http://192.168.68.125:8200/api' +export const VUE_APP_API_URL = 'https://artcloud.api.cyjyyjy.com/api' // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api'; // export const VUE_APP_API_URL = 'https://thapi.xinxintuan.co/api' // export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api'; diff --git a/manifest.json b/manifest.json index 2de1985..bb43fcc 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "name" : "zhaoshangMiniApp", + "name" : "sysxh-uniapp", "appid" : "", "description" : "", "versionName" : "1.0.0", @@ -49,9 +49,12 @@ }, "quickapp" : {}, "mp-weixin" : { - "appid" : "wx5348e39dcbbefe1e", + "appid" : "wx88e2a1d36fc0aa2f", "setting" : { - "urlCheck" : false + "urlCheck" : false, + "es6" : true, + "minified" : true, + "postcss" : true }, "usingComponents" : true, "permission" : { diff --git a/pages.json b/pages.json index 6cfafcd..44860dc 100644 --- a/pages.json +++ b/pages.json @@ -6,16 +6,15 @@ { "path": "pages/Loading/index", "style": { - "navigationBarTitleText": " ", - "navigationBarBackgroundColor": "#FE915D", - "navigationBarTextStyle": "white" + "navigationStyle": "custom" } }, { "path": "pages/home/index", "style": { "navigationStyle": "custom", - "enablePullDownRefresh": true + "enablePullDownRefresh": true, + "backgroundTextStyle": "dark" } }, { @@ -25,6 +24,13 @@ "enablePullDownRefresh": true } }, + { + "path": "pages/home/activityDetail/index", + "style": { + "navigationStyle": "custom", + "enablePullDownRefresh": true + } + }, { "path": "pages/user/index", "style": { @@ -411,25 +417,19 @@ { "path": "pages/activity/signIn/index", "style": { - "navigationBarTitleText": "报名信息填写", - "navigationBarBackgroundColor": "#EBB672", - "navigationBarTextStyle": "white" + "navigationBarTitleText": "报名信息填写" } }, { "path": "pages/activity/signIn/confirm/index", "style": { - "navigationBarTitleText": "信息确认", - "navigationBarBackgroundColor": "#EBB672", - "navigationBarTextStyle": "white" + "navigationBarTitleText": "信息确认" } }, { "path": "pages/activity/signIn/paymentSuccess/index", "style": { - "navigationBarTitleText": "支付", - "navigationBarBackgroundColor": "#EBB672", - "navigationBarTextStyle": "white" + "navigationBarTitleText": "支付" } }, { @@ -502,27 +502,22 @@ "path": "pages/information/index", "style": { "navigationBarTitleText": "资讯广场", - "enablePullDownRefresh": true + "enablePullDownRefresh": true, + "navigationStyle": "custom" } } ], "tabBar": { "backgroundColor": "#ffffff", "color": "#D4D4D4", - "selectedColor": "#FF6F34", + "selectedColor": "#000", "list": [ { "pagePath": "pages/home/index", "text": "首页", - "iconPath": "/static/tabbarComponent/icon/home.png", - "selectedIconPath": "/static/tabbarComponent/icon/home-a.png" + "iconPath": "/static/tabbarComponent/icon/tab1.png", + "selectedIconPath": "/static/tabbarComponent/icon/tab1-a.png" }, - // { - // "pagePath": "pages/demandHall/index", - // "text": "供需大厅", - // "iconPath": "/static/tabbarComponent/icon/tab2.png", - // "selectedIconPath": "/static/tabbarComponent/icon/tab2-a.png" - // }, { "pagePath": "pages/demandHall/business/index", "text": "商业", @@ -539,14 +534,14 @@ { "pagePath": "pages/information/index", "text": "资讯", - "iconPath": "/static/tabbarComponent/icon/tab5.png", - "selectedIconPath": "/static/tabbarComponent/icon/tab5-a.png" + "iconPath": "/static/tabbarComponent/icon/tab4.png", + "selectedIconPath": "/static/tabbarComponent/icon/tab4-a.png" }, { "pagePath": "pages/user/index", "text": "我的", - "iconPath": "/static/tabbarComponent/icon/tab4.png", - "selectedIconPath": "/static/tabbarComponent/icon/tab4-a.png" + "iconPath": "/static/tabbarComponent/icon/tab5.png", + "selectedIconPath": "/static/tabbarComponent/icon/tab5-a.png" } ] }, @@ -560,7 +555,7 @@ "globalStyle": { "backgroundTextStyle": "dark", "navigationBarBackgroundColor": "#fff", - "navigationBarTitleText": "禅易云生态", + "navigationBarTitleText": "湖北省艺术设计协会", "navigationBarTextStyle": "black" }, "subPackages": [ diff --git a/pages/Loading/index.vue b/pages/Loading/index.vue index 5a29b8b..7c8011b 100644 --- a/pages/Loading/index.vue +++ b/pages/Loading/index.vue @@ -1,8 +1,7 @@