diff --git a/App.vue b/App.vue index b55ca78..e81be0c 100644 --- a/App.vue +++ b/App.vue @@ -3,9 +3,9 @@ onLaunch: function() {}, onShow: function() { this.$store.commit('initConfig') - this.$store.commit('getBanner') - this.$store.commit('getArticleList') - this.$store.commit('getProblemList') + // this.$store.commit('getBanner') + // this.$store.commit('getArticleList') + // this.$store.commit('getProblemList') }, onHide: function() {} } @@ -17,7 +17,7 @@ background-color: #f7f7f7; font-size: 30rpx; } - + .background { background-color: #f7f7f7; } @@ -27,12 +27,12 @@ } .page-bg{ - height: calc(100vh - 120rpx); + height: 100vh; width: 100vw; position: absolute; top: 0; left: 0; - padding-top: 120rpx; + z-index: -1; } // .logo { @@ -120,13 +120,13 @@ overflow: hidden; */ } - .content { - display: flex; - flex-direction: column; - align-items: center; - padding-top: 480rpx; - position: relative; - } + // .content { + // display: flex; + // flex-direction: column; + // align-items: center; + // padding-top: 480rpx; + // position: relative; + // } .content_now{ display: flex; flex-direction: column; @@ -139,6 +139,7 @@ padding: 0 70rpx; box-sizing: border-box; width: 100%; + --color2 : #000; } .mian-btn { @@ -156,7 +157,7 @@ .second-color { color: #d2d2d2; - margin-top: 40rpx; + // margin-top: 40rpx; font-size: 26rpx; } diff --git a/api/api.js b/api/api.js index d1fa82a..1648097 100644 --- a/api/api.js +++ b/api/api.js @@ -35,17 +35,17 @@ const config = { showLoading : true, }, - //首页-出现问题列表接口 - problemList: { - url: '/applet_index/problemList', - method: 'GET', - }, + // //首页-出现问题列表接口 + // problemList: { + // url: '/applet_index/problemList', + // method: 'GET', + // }, - //首页-文章列表接口 - articleList: { - url: '/applet_index/articleList', - method: 'GET', - }, + // //首页-文章列表接口 + // articleList: { + // url: '/applet_index/articleList', + // method: 'GET', + // }, //首页-品牌介绍接口 getBrand: { url: '/applet_index/getBrand', @@ -53,73 +53,94 @@ const config = { }, //首页-轮播图接口 - bannerList: { - url: '/applet_index/bannerList', - method: 'GET', - }, + // bannerList: { + // url: '/applet_index/bannerList', + // method: 'GET', + // }, //提交问答记录 - submitLog: { - url: '/applet_post/submitLog', - method: 'POST', - limit : 1000, - showLoading : true, - auth: true, - }, + // submitLog: { + // url: '/applet_post/submitLog', + // method: 'POST', + // limit : 1000, + // showLoading : true, + // auth: true, + // }, //提交预约信息 - submit: { - url: '/applet_post/submit', - method: 'POST', - limit : 1000, - showLoading : true, - auth: true, - }, - //查询我的问答记录 - queryMyLog: { - url: '/applet_post/queryMyLog', - method: 'GET', - auth: true, - showLoading : true, - }, - //查询预约记录 - queryReservation: { - url: '/applet_post/queryReservation', - method: 'GET', - auth: true, - }, - //查询预约详情 - queryReservationDetail: { - url: '/applet_post/queryReservationDetail', - method: 'GET', - auth: true, - }, - //查询预约详情 - queryReservationDetail: { - url: '/applet_post/queryReservationDetail', + // submit: { + // url: '/applet_post/submit', + // method: 'POST', + // limit : 1000, + // showLoading : true, + // auth: true, + // }, + // //查询我的问答记录 + // queryMyLog: { + // url: '/applet_post/queryMyLog', + // method: 'GET', + // auth: true, + // showLoading : true, + // }, + // //查询预约记录 + // queryReservation: { + // url: '/applet_post/queryReservation', + // method: 'GET', + // auth: true, + // }, + // //查询预约详情 + // queryReservationDetail: { + // url: '/applet_post/queryReservationDetail', + // method: 'GET', + // auth: true, + // }, + // //查询预约详情 + // queryReservationDetail: { + // url: '/applet_post/queryReservationDetail', + // method: 'GET', + // auth: true, + // }, + // //取消预约 + // cancelReservation: { + // url: '/applet_post/cancelReservation', + // method: 'GET', + // auth: true, + // showLoading : true, + // }, + + // //我的-评论题目列表接口 + // queryAnswerList: { + // url: '/applet_post/queryAnswerList', + // method: 'GET', + // }, + // //我的-回答评论接口 + // answerComment: { + // url: '/applet_post/answerComment', + // method: 'POST', + // auth : true, + // }, + + // ======================================================= + // 第二版本 + // ======================================================= + + // 1、查询第一个题目接口（返回一个题目和答案列表） + firstQuestion: { + url: '/applet_index/firstQuestion', method: 'GET', - auth: true, }, - //取消预约 - cancelReservation: { - url: '/applet_post/cancelReservation', + // 2、根据题目id查询题目接口（返回一个题目和答案列表） + getProblemById: { + url: '/applet_index/getProblemById', method: 'GET', - auth: true, - showLoading : true, + limit : 500, }, - - //我的-评论题目列表接口 - queryAnswerList: { - url: '/applet_post/queryAnswerList', + // 3、根据用户选择的答案id列表查询出获得的称号接口（返回称号图片、文章列表） + getTitleByIds: { + url: '/applet_index/getTitleByIds', method: 'GET', + limit : 500, }, - //我的-回答评论接口 - answerComment: { - url: '/applet_post/answerComment', - method: 'POST', - auth : true, - }, - } @@ -146,6 +167,10 @@ export function api(key, data, callback, loadingTitle){ let storageKey = 'limit:' + req.url let storage = uni.getStorageSync(storageKey) if(storage && new Date().getTime() - parseInt(storage) < req.limit){ + // uni.showToast({ + // title: '请勿点击过快', + // icon: 'none', + // }) return } uni.setStorageSync(storageKey, new Date().getTime()) diff --git a/config.js b/config.js index 4befc4c..9fd249a 100644 --- a/config.js +++ b/config.js @@ -7,7 +7,7 @@ import uvUI from '@/uni_modules/uv-ui-tools' Vue.use(uvUI); // 当前环境 -const type = 'prod' +const type = 'dev' // 环境配置 @@ -24,18 +24,18 @@ const config = { // 默认配置 const defaultConfig = { mapKey : 'XMBBZ-BCPCV-SXPPQ-5Y7MY-PHZXK-YFFVU', - aliOss : { - url : 'https://tennis-oss.xzaiyp.top/', - config : { + aliOss: { + url: 'https://image.hhlm1688.com/', + config: { //桶的地址 region: 'oss-cn-guangzhou', //id - accessKeyId:'LTAI5tNycA46YTwm383dRvMV', + accessKeyId: 'LTAI5tQSs47izVy8DLVdwUU9', //密钥 - accessKeySecret:'tAdbYQCmdur6jbZ8hjvgB7T1Z52mIG', + accessKeySecret: 'qHI7C3PaXYZySr84HTToviC71AYlFq', //桶的名字 - bucket: 'zhuoqiu-image', - endpoint:'oss-cn-guangzhou.aliyuncs.com', + bucket: 'hanhaiimage', + endpoint: 'oss-cn-shenzhen.aliyuncs.com', } }, } diff --git a/static/image/PrivacyAgreementPoup/icon.png b/doc/PrivacyAgreementPoup/icon.png similarity index 100% rename from static/image/PrivacyAgreementPoup/icon.png rename to doc/PrivacyAgreementPoup/icon.png diff --git a/doc/address.png b/doc/address.png deleted file mode 100644 index 90d2487..0000000 Binary files a/doc/address.png and /dev/null differ diff --git a/static/image/bg/1.png b/doc/bg - 副本/1.png similarity index 100% rename from static/image/bg/1.png rename to doc/bg - 副本/1.png diff --git a/static/image/bg/2.png b/doc/bg - 副本/2.png similarity index 100% rename from static/image/bg/2.png rename to doc/bg - 副本/2.png diff --git a/static/image/bg/3.png b/doc/bg - 副本/3.png similarity index 100% rename from static/image/bg/3.png rename to doc/bg - 副本/3.png diff --git a/static/image/bg/4.png b/doc/bg - 副本/4.png similarity index 100% rename from static/image/bg/4.png rename to doc/bg - 副本/4.png diff --git a/static/image/bg/5.png b/doc/bg - 副本/5.png similarity index 100% rename from static/image/bg/5.png rename to doc/bg - 副本/5.png diff --git a/doc/bg - 副本/bg1x2.png b/doc/bg - 副本/bg1x2.png new file mode 100644 index 0000000..602cd50 Binary files /dev/null and b/doc/bg - 副本/bg1x2.png differ diff --git a/doc/bg - 副本/logo @2x.png b/doc/bg - 副本/logo @2x.png new file mode 100644 index 0000000..81251e3 Binary files /dev/null and b/doc/bg - 副本/logo @2x.png differ diff --git a/doc/bg - 副本/百富门logo_slices.zip b/doc/bg - 副本/百富门logo_slices.zip new file mode 100644 index 0000000..ccfb7d3 Binary files /dev/null and b/doc/bg - 副本/百富门logo_slices.zip differ diff --git a/doc/bg - 副本/组 3_slices.zip b/doc/bg - 副本/组 3_slices.zip new file mode 100644 index 0000000..8444d62 Binary files /dev/null and b/doc/bg - 副本/组 3_slices.zip differ diff --git a/doc/bg - 副本/酒2_slices.zip b/doc/bg - 副本/酒2_slices.zip new file mode 100644 index 0000000..b37ad5a Binary files /dev/null and b/doc/bg - 副本/酒2_slices.zip differ diff --git a/doc/bg/bg1x2.png b/doc/bg/bg1x2.png new file mode 100644 index 0000000..602cd50 Binary files /dev/null and b/doc/bg/bg1x2.png differ diff --git a/doc/bg/close-icon.png b/doc/bg/close-icon.png new file mode 100644 index 0000000..763fc31 Binary files /dev/null and b/doc/bg/close-icon.png differ diff --git a/doc/bg/content.png b/doc/bg/content.png new file mode 100644 index 0000000..e5059ec Binary files /dev/null and b/doc/bg/content.png differ diff --git a/doc/bg/fail.png b/doc/bg/fail.png new file mode 100644 index 0000000..d6b0386 Binary files /dev/null and b/doc/bg/fail.png differ diff --git a/doc/bg/jiu.png b/doc/bg/jiu.png new file mode 100644 index 0000000..aa02c9f Binary files /dev/null and b/doc/bg/jiu.png differ diff --git a/doc/bg/loglist.png b/doc/bg/loglist.png new file mode 100644 index 0000000..81251e3 Binary files /dev/null and b/doc/bg/loglist.png differ diff --git a/doc/bg/logolist2.png b/doc/bg/logolist2.png new file mode 100644 index 0000000..8d0c946 Binary files /dev/null and b/doc/bg/logolist2.png differ diff --git a/doc/bg/logtop.png b/doc/bg/logtop.png new file mode 100644 index 0000000..36e5918 Binary files /dev/null and b/doc/bg/logtop.png differ diff --git a/doc/bg/message.png b/doc/bg/message.png new file mode 100644 index 0000000..3951aaa Binary files /dev/null and b/doc/bg/message.png differ diff --git a/doc/bg/sbg.png b/doc/bg/sbg.png new file mode 100644 index 0000000..5e2580a Binary files /dev/null and b/doc/bg/sbg.png differ diff --git a/doc/bg/success.png b/doc/bg/success.png new file mode 100644 index 0000000..3a3b74f Binary files /dev/null and b/doc/bg/success.png differ diff --git a/doc/bg/user.png b/doc/bg/user.png new file mode 100644 index 0000000..2d90411 Binary files /dev/null and b/doc/bg/user.png differ diff --git a/doc/bg/组 1@2x.png b/doc/bg/组 1@2x.png new file mode 100644 index 0000000..b7d3bd3 Binary files /dev/null and b/doc/bg/组 1@2x.png differ diff --git a/doc/c.png b/doc/c.png deleted file mode 100644 index c5e7e67..0000000 Binary files a/doc/c.png and /dev/null differ diff --git a/doc/cart.png b/doc/cart.png deleted file mode 100644 index 4dab96f..0000000 Binary files a/doc/cart.png and /dev/null differ diff --git a/doc/category.png b/doc/category.png deleted file mode 100644 index 335c270..0000000 Binary files a/doc/category.png and /dev/null differ diff --git a/doc/center.png b/doc/center.png deleted file mode 100644 index 4c72a48..0000000 Binary files a/doc/center.png and /dev/null differ diff --git a/doc/editAddress.png b/doc/editAddress.png deleted file mode 100644 index de90d40..0000000 Binary files a/doc/editAddress.png and /dev/null differ diff --git a/doc/home-s.png b/doc/home-s.png deleted file mode 100644 index 394de5f..0000000 Binary files a/doc/home-s.png and /dev/null differ diff --git a/doc/home.png b/doc/home.png deleted file mode 100644 index 564a41d..0000000 Binary files a/doc/home.png and /dev/null differ diff --git a/static/image/home/btn.png b/doc/home/btn.png similarity index 100% rename from static/image/home/btn.png rename to doc/home/btn.png diff --git a/static/image/home/home-background.png b/doc/home/home-background.png similarity index 100% rename from static/image/home/home-background.png rename to doc/home/home-background.png diff --git a/doc/order.png b/doc/order.png deleted file mode 100644 index 1a218e6..0000000 Binary files a/doc/order.png and /dev/null differ diff --git a/doc/productDetail.png b/doc/productDetail.png deleted file mode 100644 index 0bd6dab..0000000 Binary files a/doc/productDetail.png and /dev/null differ diff --git a/doc/productUnit.png b/doc/productUnit.png deleted file mode 100644 index 348b83b..0000000 Binary files a/doc/productUnit.png and /dev/null differ diff --git a/doc/purse.png b/doc/purse.png deleted file mode 100644 index 6f091b4..0000000 Binary files a/doc/purse.png and /dev/null differ diff --git a/doc/下一页_slices.zip b/doc/下一页_slices.zip new file mode 100644 index 0000000..82b8ac7 Binary files /dev/null and b/doc/下一页_slices.zip differ diff --git a/doc/威士忌鉴玩家@2x.png b/doc/威士忌鉴玩家@2x.png new file mode 100644 index 0000000..b2c21b7 Binary files /dev/null and b/doc/威士忌鉴玩家@2x.png differ diff --git a/doc/已满18岁_slices/-m--e-组 1@2x.png b/doc/已满18岁_slices/-m--e-组 1@2x.png new file mode 100644 index 0000000..28efe00 Binary files /dev/null and b/doc/已满18岁_slices/-m--e-组 1@2x.png differ diff --git a/doc/已满18岁_slices/-m--e-组 1@3x.png b/doc/已满18岁_slices/-m--e-组 1@3x.png new file mode 100644 index 0000000..2483c4d Binary files /dev/null and b/doc/已满18岁_slices/-m--e-组 1@3x.png differ diff --git a/doc/组 4@2x.png b/doc/组 4@2x.png new file mode 100644 index 0000000..cd014f7 Binary files /dev/null and b/doc/组 4@2x.png differ diff --git a/main.js b/main.js index 84751ca..f971a7f 100644 --- a/main.js +++ b/main.js @@ -14,6 +14,10 @@ import store from '@/store/store' import './config' import './utils/index.js' +import mixinConfigList from '@/mixins/configList.js' + +Vue.mixin(mixinConfigList) + //组件注册 import configPopup from '@/components/config/configPopup.vue' import navbar from '@/components/base/navbar.vue' diff --git a/mixins/configList.js b/mixins/configList.js new file mode 100644 index 0000000..f621471 --- /dev/null +++ b/mixins/configList.js @@ -0,0 +1,43 @@ + + +import { mapState } from 'vuex' +export default { + data() { + return { + // 默认的全局分享内容 + Gshare: { + // title: '三只青蛙', + path: '/pages/index/index', // 全局分享的路径，比如 首页 + // imageUrl: '/static/image/login/logo.png', // 全局分享的图片(可本地可网络) + } + } + }, + computed: { + ...mapState(['configList', 'userInfo']), + }, + // 定义全局分享 + // 1.发送给朋友 + onShareAppMessage(res) { + let o = { + ...this.Gshare, + title : this.configList.logo_name, + } + if(this.userInfo.id){ + o.path = this.Gshare.path + '?shareId=' + this.userInfo.id + } + return o + }, + //2.分享到朋友圈 + onShareTimeline(res) { + let o = { + ...this.Gshare, + title : this.configList.logo_name, + } + if(this.userInfo.id){ + o.path = this.Gshare.path + '?shareId=' + this.userInfo.id + } + return o + }, + methods: { + } +} \ No newline at end of file diff --git a/pages - 副本.json b/pages - 副本.json new file mode 100644 index 0000000..760fc0e --- /dev/null +++ b/pages - 副本.json @@ -0,0 +1,94 @@ +{ + "pages": [ + { + "path" : "pages/index/agreement", + "style" : + { + "navigationBarTitleText" : "" + } + }, + { + "path": "pages/index/index", + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/index/home", + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/index/article" + }, + { + "path": "pages/index/cancelArticle" + }, + { + "path": "pages/index/order", + "style": { + "enablePullDownRefresh": true + } + }, + { + "path" : "pages/index/introduce", + "style" : + { + "navigationBarTitleText" : "" + } + }, + { + "path" : "pages/index/logoInfo", + "style" : + { + "navigationBarTitleText" : "" + } + }, + { + "path" : "pages/index/review", + "style" : + { + "navigationBarTitleText" : "" + } + }, + { + "path" : "pages/index/preAppoint", + "style" : + { + "navigationBarTitleText" : "" + } + } + ], + "preloadRule": { + "pages/index/home": { + "network": "all", + "packages": ["pages_order"] + } + }, + "subPackages": [{ + "root": "pages_order", + "pages": [ + { + "path": "auth/wxLogin" + }, + { + "path": "auth/wxUserInfo" + }, + { + "path" : "info/appoint" + }, + { + "path" : "info/fillInfo" + } + ] + }], + "globalStyle": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "", + "navigationBarBackgroundColor": "#F8F8F8", + "backgroundColor": "#F8F8F8", + "navigationStyle": "custom" + }, + "uniIdRouter": {} +} \ No newline at end of file diff --git a/pages.json b/pages.json index 17367e2..04d616f 100644 --- a/pages.json +++ b/pages.json @@ -1,5 +1,12 @@ { "pages": [ + { + "path" : "pages/index/agreement", + "style" : + { + "navigationBarTitleText" : "" + } + }, { "path": "pages/index/index", "style": { @@ -18,12 +25,6 @@ { "path": "pages/index/cancelArticle" }, - { - "path": "pages/index/order", - "style": { - "enablePullDownRefresh": true - } - }, { "path" : "pages/index/introduce", "style" : @@ -39,7 +40,7 @@ } }, { - "path" : "pages/index/review", + "path" : "pages/index/preAppoint", "style" : { "navigationBarTitleText" : "" @@ -63,9 +64,6 @@ }, { "path" : "info/appoint" - }, - { - "path" : "info/fillInfo" } ] }], diff --git a/pages/index/agreement.vue b/pages/index/agreement.vue new file mode 100644 index 0000000..fa63c69 --- /dev/null +++ b/pages/index/agreement.vue @@ -0,0 +1,150 @@ + + + + + diff --git a/pages/index/home.vue b/pages/index/home.vue index 9c46004..221c9a8 100644 --- a/pages/index/home.vue +++ b/pages/index/home.vue @@ -1,35 +1,37 @@