From 71dc3e55d9b69ac357b96bdbd25a98498fa09004 Mon Sep 17 00:00:00 2001 From: mactj Date: Fri, 15 Jan 2021 12:00:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mini-app/.vscode/settings.json | 3 + mini-app/project.config.json | 2 +- mini-app/src/app.wpy | 8 +- mini-app/src/{xiao4rBase.js => appManager.js} | 4 +- mini-app/src/components/mall/mall-home.wpy | 49 ---- .../components/mall/{ => tab}/mall-bbs.wpy | 22 +- .../components/mall/{ => tab}/mall-car.wpy | 0 .../src/components/mall/tab/mall-home.wpy | 174 ++++++++++++++ .../src/components/mall/{ => tab}/mall-my.wpy | 0 .../mall/{ => tab}/mall-shopping.wpy | 4 +- .../components/user/dialog-registration.wpy | 20 +- mini-app/src/config.js | 3 + mini-app/src/js/request.js | 4 +- mini-app/src/mixins/defaultMix.js | 27 +++ mini-app/src/pages/form1.wpy | 22 +- mini-app/src/pages/form2.wpy | 4 +- mini-app/src/pages/form3.wpy | 12 +- mini-app/src/pages/form4.wpy | 10 +- mini-app/src/pages/form5.wpy | 14 +- mini-app/src/pages/form6.wpy | 14 +- mini-app/src/pages/index.wpy | 16 +- mini-app/src/pages/mall/goods-detail.wpy | 2 - mini-app/src/pages/mall/index.wpy | 114 +++++++-- mini-app/src/store/constant/imageDefine.js | 16 ++ mini-app/src/store/constant/nav/home.js | 26 +++ mini-app/src/store/constant/navDefine.js | 8 + mini-app/src/store/index.js | 14 +- mini-app/src/vant/button/index.wxss | 220 +++++++++++++++++- mini-app/src/vant/grid-item/index.wxss | 88 ++++++- 29 files changed, 742 insertions(+), 158 deletions(-) create mode 100644 mini-app/.vscode/settings.json rename mini-app/src/{xiao4rBase.js => appManager.js} (87%) delete mode 100644 mini-app/src/components/mall/mall-home.wpy rename mini-app/src/components/mall/{ => tab}/mall-bbs.wpy (89%) rename mini-app/src/components/mall/{ => tab}/mall-car.wpy (100%) create mode 100644 mini-app/src/components/mall/tab/mall-home.wpy rename mini-app/src/components/mall/{ => tab}/mall-my.wpy (100%) rename mini-app/src/components/mall/{ => tab}/mall-shopping.wpy (91%) create mode 100644 mini-app/src/mixins/defaultMix.js create mode 100644 mini-app/src/store/constant/imageDefine.js create mode 100644 mini-app/src/store/constant/nav/home.js create mode 100644 mini-app/src/store/constant/navDefine.js diff --git a/mini-app/.vscode/settings.json b/mini-app/.vscode/settings.json new file mode 100644 index 000000000..ed94f44b1 --- /dev/null +++ b/mini-app/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "git.ignoreLimitWarning": true +} \ No newline at end of file diff --git a/mini-app/project.config.json b/mini-app/project.config.json index 83e86e93d..bbb9ed82a 100644 --- a/mini-app/project.config.json +++ b/mini-app/project.config.json @@ -3,7 +3,7 @@ "setting": { "urlCheck": false, "es6": false, - "enhance": true, + "enhance": false, "postcss": false, "preloadBackgroundData": false, "minified": false, diff --git a/mini-app/src/app.wpy b/mini-app/src/app.wpy index d9f6ecdde..d02d249d0 100644 --- a/mini-app/src/app.wpy +++ b/mini-app/src/app.wpy @@ -6,9 +6,8 @@ align-items: center; justify-content: space-between; box-sizing: border-box; + } - - .buttonColor { background: #AC1630; color: #fff; @@ -38,6 +37,10 @@ height: 15px; } +.fxc{ + display: flex; + flex-direction: column; +} @@ -108,6 +111,7 @@ navigationBarBackgroundColor: '#fff', navigationBarTitleText: 'WeChat', navigationBarTextStyle: 'white', navigationStyle: 'custom', +backgroundColor: '#222222' }, usingComponents: { 'nav-bar': './components/nav-bar', diff --git a/mini-app/src/xiao4rBase.js b/mini-app/src/appManager.js similarity index 87% rename from mini-app/src/xiao4rBase.js rename to mini-app/src/appManager.js index afffb93bf..7c8b5d848 100644 --- a/mini-app/src/xiao4rBase.js +++ b/mini-app/src/appManager.js @@ -1,7 +1,7 @@ import store from '@/store' -class Xiao4rBase { +class AppManager { saveOpenid(openid) { wx.setStorageSync('openid', openid) store.dispatch('setOpenidAction', openid) @@ -22,4 +22,4 @@ class Xiao4rBase { } } -export default new Xiao4rBase() +export default new AppManager() diff --git a/mini-app/src/components/mall/mall-home.wpy b/mini-app/src/components/mall/mall-home.wpy deleted file mode 100644 index aa5d3917a..000000000 --- a/mini-app/src/components/mall/mall-home.wpy +++ /dev/null @@ -1,49 +0,0 @@ - - - - - -{ -navigationBarTitleText: '' -} - diff --git a/mini-app/src/components/mall/mall-bbs.wpy b/mini-app/src/components/mall/tab/mall-bbs.wpy similarity index 89% rename from mini-app/src/components/mall/mall-bbs.wpy rename to mini-app/src/components/mall/tab/mall-bbs.wpy index 53f777469..3b01bb9e3 100644 --- a/mini-app/src/components/mall/mall-bbs.wpy +++ b/mini-app/src/components/mall/tab/mall-bbs.wpy @@ -5,25 +5,23 @@ height: 536rpx; z-index: -10; - } + +{ +navigationBarTitleText: '' +} + diff --git a/mini-app/src/components/mall/mall-my.wpy b/mini-app/src/components/mall/tab/mall-my.wpy similarity index 100% rename from mini-app/src/components/mall/mall-my.wpy rename to mini-app/src/components/mall/tab/mall-my.wpy diff --git a/mini-app/src/components/mall/mall-shopping.wpy b/mini-app/src/components/mall/tab/mall-shopping.wpy similarity index 91% rename from mini-app/src/components/mall/mall-shopping.wpy rename to mini-app/src/components/mall/tab/mall-shopping.wpy index 691cea7db..dcc8f3df3 100644 --- a/mini-app/src/components/mall/mall-shopping.wpy +++ b/mini-app/src/components/mall/tab/mall-shopping.wpy @@ -24,7 +24,7 @@ import wepy from '@wepy/core' import store from '@/store' import { mapActions } from '@wepy/x' -import xiao4rBase from '../../xiao4rBase' +import appManager from '../../../appManager' wepy.component({ store, @@ -41,7 +41,7 @@ wepy.component({ onItem(item) { console.log(item) - xiao4rBase.navigateTo(`goods-detail?id=${item}`) + appManager.navigateTo(`goods-detail?id=${item}`) } }, diff --git a/mini-app/src/components/user/dialog-registration.wpy b/mini-app/src/components/user/dialog-registration.wpy index d04f1a420..9016611d9 100644 --- a/mini-app/src/components/user/dialog-registration.wpy +++ b/mini-app/src/components/user/dialog-registration.wpy @@ -75,7 +75,7 @@ import wepy from '@wepy/core' import store from '@/store' import { mapActions, mapState } from '@wepy/x' import eventHub from '../../common/eventHub' -import xiao4rBase from '../../xiao4rBase' +import appManager from '../../appManager' import userApis from '../../apis/userApis' wepy.component({ @@ -109,29 +109,29 @@ wepy.component({ if (!this.isChecked) { - xiao4rBase.showToast('请确认xxxx协议.') + appManager.showToast('请确认xxxx协议.') return false } if (!this.user.mobile) { - xiao4rBase.showToast('请授权获取手机号码.') + appManager.showToast('请授权获取手机号码.') return false } if (!this.user.userInfo) { - xiao4rBase.showToast('请授权获取用户昵称.') + appManager.showToast('请授权获取用户昵称.') return false } let self = this userApis.registrationByMini(this.user).then(r => { if (r.code === 200) { - xiao4rBase.showToast('注册成功!') + appManager.showToast('注册成功!') self.isShow = false self.setTokenAction(r.token) } else { - xiao4rBase.showToast(r.msg) + appManager.showToast(r.msg) } }).catch(e => { - xiao4rBase.showToast('注册失败!') + appManager.showToast('注册失败!') }) }, async onGetMobile(e) { @@ -139,7 +139,7 @@ wepy.component({ wx.showLoading({ title: '获取中...', mask: true }) try { let rsp = await userApis.sendMobile({ - openid: xiao4rBase.getOpenid(), + openid: appManager.getOpenid(), detail: e.$wx.detail }) @@ -147,10 +147,10 @@ wepy.component({ if (rsp.code === 200) { this.setMobileAction(rsp.data.mobile) } else { - xiao4rBase.showToast('服务器连接异常.') + appManager.showToast('服务器连接异常.') } } catch (e) { - xiao4rBase.showToast('服务器连接异常.') + appManager.showToast('服务器连接异常.') } finally { wx.hideLoading() } diff --git a/mini-app/src/config.js b/mini-app/src/config.js index 6a7f27741..5dbfa17ce 100644 --- a/mini-app/src/config.js +++ b/mini-app/src/config.js @@ -3,3 +3,6 @@ */ export const MINI_DEPTID = 100 + + + diff --git a/mini-app/src/js/request.js b/mini-app/src/js/request.js index 2b4c617b8..989bbd849 100644 --- a/mini-app/src/js/request.js +++ b/mini-app/src/js/request.js @@ -1,4 +1,4 @@ -import xiao4rBase from '../xiao4rBase' +import appManager from '../appManager' import { uuid } from './utils/uuid' import store from '@/store' @@ -33,7 +33,7 @@ class Xiao4rRequest { data: req.data, success: rsp => resolve(rsp.data), fail: error => { - xiao4rBase.showToast('网络连接异常.') + appManager.showToast('网络连接异常.') reject(error) }, complete: () => { diff --git a/mini-app/src/mixins/defaultMix.js b/mini-app/src/mixins/defaultMix.js new file mode 100644 index 000000000..8a0573851 --- /dev/null +++ b/mini-app/src/mixins/defaultMix.js @@ -0,0 +1,27 @@ +import appManager from '../appManager' + +export default { + data: { + + }, + methods: { + + navNext (url) { + appManager.navigateTo(url) + }, + navBack() { + wx.navigateBack() + } + }, + created () { + console.log('created page') + + let pages = getCurrentPages() + console.log(pages) + let currPage = null + if (pages.length) { + currPage = pages[pages.length - 1] + } + console.log(currPage) + } +} diff --git a/mini-app/src/pages/form1.wpy b/mini-app/src/pages/form1.wpy index 0d043ce9e..a133971bb 100644 --- a/mini-app/src/pages/form1.wpy +++ b/mini-app/src/pages/form1.wpy @@ -161,7 +161,7 @@ import wepy from '@wepy/core' import eventHub from '../common/eventHub' import store from '../store' import { mapState, mapActions } from '@wepy/x' -import xiao4rBase from '../xiao4rBase' +import appManager from '../appManager' import userApis from '../apis/userApis' wepy.page({ @@ -202,16 +202,16 @@ wepy.page({ wx.showLoading({ title: '获取中...', mask: true }) try { let rsp = await userApis.sendMobile({ - openid: xiao4rBase.getOpenid(), + openid: appManager.getOpenid(), detail: e.$wx.detail }) if (rsp.code === 200) { this.wineryForm.mobile = rsp.data.mobile } - xiao4rBase.showToast(rsp.msg) + appManager.showToast(rsp.msg) } catch (e) { - xiao4rBase.showToast('服务器连接异常,请联系管理员.') + appManager.showToast('服务器连接异常,请联系管理员.') } finally { wx.hideLoading() } @@ -221,37 +221,37 @@ wepy.page({ console.log(this.form) if (!this.wineryForm.mobile) { - xiao4rBase.showToast('请授权获取您的手机号') + appManager.showToast('请授权获取您的手机号') return } if (!this.wineryForm.wineryName) { - xiao4rBase.showToast('请输入您的酒庄名称') + appManager.showToast('请输入您的酒庄名称') return } if (!this.wineryForm.buildTime) { - xiao4rBase.showToast('请输入您的酒庄成立时间') + appManager.showToast('请输入您的酒庄成立时间') return } if (!this.wineryForm.address) { - xiao4rBase.showToast('请输入您的酒庄地址') + appManager.showToast('请输入您的酒庄地址') return } if (!this.wineryForm.wineryArea) { - xiao4rBase.showToast('请输入您的酒庄总面积') + appManager.showToast('请输入您的酒庄总面积') return } if (!this.wineryForm.buildArea) { - xiao4rBase.showToast('请输入您的建筑总面积') + appManager.showToast('请输入您的建筑总面积') return } // this.setFormAction(this.form) - xiao4rBase.navigateTo('form2') + appManager.navigateTo('form2') } }, diff --git a/mini-app/src/pages/form2.wpy b/mini-app/src/pages/form2.wpy index ddb032a37..6251b7e92 100644 --- a/mini-app/src/pages/form2.wpy +++ b/mini-app/src/pages/form2.wpy @@ -100,7 +100,7 @@ import wepy from '@wepy/core' import eventHub from '../common/eventHub' import store from '../store' import { mapState } from '@wepy/x' -import xiao4rBase from '../xiao4rBase' +import appManager from '../appManager' wepy.page({ store, @@ -124,7 +124,7 @@ wepy.page({ methods: { onNext() { - xiao4rBase.navigateTo('form3') + appManager.navigateTo('form3') } }, diff --git a/mini-app/src/pages/form3.wpy b/mini-app/src/pages/form3.wpy index cda16dbb1..ce9b8eb8e 100644 --- a/mini-app/src/pages/form3.wpy +++ b/mini-app/src/pages/form3.wpy @@ -191,7 +191,7 @@ import wepy from '@wepy/core' import eventHub from '../common/eventHub' import store from '../store' import { mapActions,mapState } from '@wepy/x' -import xiao4rBase from '../xiao4rBase' +import appManager from '../appManager' import xiao4rApis from '../apis/xiao4rApis' wepy.page({ store, @@ -302,29 +302,29 @@ wepy.page({ }, onNext() { if (!this.wineryForm.plantArea) { - xiao4rBase.showToast('请输入种植面积！') + appManager.showToast('请输入种植面积！') return } if (!this.wineryForm.plantWeight) { - xiao4rBase.showToast('请输入产量！') + appManager.showToast('请输入产量！') return } let error = this.checkVariety(this.wineryForm.redVariety) if (error) { - xiao4rBase.showToast('请检查红葡萄信息:' + error) + appManager.showToast('请检查红葡萄信息:' + error) return } error = this.checkVariety(this.wineryForm.whiteVariety) if (error) { - xiao4rBase.showToast('请检查白葡萄信息:' + error) + appManager.showToast('请检查白葡萄信息:' + error) return } // this.setFormAction(this.form) - xiao4rBase.navigateTo('form4') + appManager.navigateTo('form4') }, onBack() { // this.setFormAction(this.form) diff --git a/mini-app/src/pages/form4.wpy b/mini-app/src/pages/form4.wpy index 8bcb40ea9..535241568 100644 --- a/mini-app/src/pages/form4.wpy +++ b/mini-app/src/pages/form4.wpy @@ -79,7 +79,7 @@ import wepy from '@wepy/core' import eventHub from '../common/eventHub' import store from '../store' import { mapActions,mapState } from '@wepy/x' -import xiao4rBase from '../xiao4rBase' +import appManager from '../appManager' import xiao4rApis from '../apis/xiao4rApis' wepy.page({ @@ -123,20 +123,20 @@ wepy.page({ onNext() { if (this.wineryForm.fermentationProcess.length < 1) { - xiao4rBase.showToast('请选择酒精发酵工艺!') + appManager.showToast('请选择酒精发酵工艺!') return } if (this.wineryForm.container.length < 1) { - xiao4rBase.showToast('请选择热化容器!') + appManager.showToast('请选择热化容器!') return } if (this.wineryForm.clarificationMethod.length < 1) { - xiao4rBase.showToast('请选择澄清方式!') + appManager.showToast('请选择澄清方式!') return } - xiao4rBase.navigateTo('form5') + appManager.navigateTo('form5') }, onBack() { diff --git a/mini-app/src/pages/form5.wpy b/mini-app/src/pages/form5.wpy index 18fbb1381..71efc2dd8 100644 --- a/mini-app/src/pages/form5.wpy +++ b/mini-app/src/pages/form5.wpy @@ -137,7 +137,7 @@ import wepy from '@wepy/core' import eventHub from '../common/eventHub' import store from '../store' import { mapState } from '@wepy/x' -import xiao4rBase from '../xiao4rBase' +import appManager from '../appManager' import xiao4rApis from '../apis/xiao4rApis' import validateUtils from '../js/utils/validateUtils' @@ -198,31 +198,31 @@ wepy.page({ onNext() { if (!validateUtils.isIntOrDecimal(this.wineryForm.annualOutput)) { - xiao4rBase.showToast('请输入正确的年产量!') + appManager.showToast('请输入正确的年产量!') return } if (!validateUtils.isIntOrDecimal(this.wineryForm.stock)) { - xiao4rBase.showToast('请输入正确的当前库存!') + appManager.showToast('请输入正确的当前库存!') return } if (!this.wineryForm.bucketCount) { - xiao4rBase.showToast('请输入橡木桶数量!') + appManager.showToast('请输入橡木桶数量!') return } if (this.wineryForm.mainPrice.length < 1) { - xiao4rBase.showToast('请选择主要产品定价!') + appManager.showToast('请选择主要产品定价!') return } if (this.wineryForm.salesMode.length < 1) { - xiao4rBase.showToast('请选择销售方式!') + appManager.showToast('请选择销售方式!') return } - xiao4rBase.navigateTo('form6') + appManager.navigateTo('form6') }, onBack() { wx.navigateBack() diff --git a/mini-app/src/pages/form6.wpy b/mini-app/src/pages/form6.wpy index a55ada934..606b87c4f 100644 --- a/mini-app/src/pages/form6.wpy +++ b/mini-app/src/pages/form6.wpy @@ -117,7 +117,7 @@ import wepy from '@wepy/core' import eventHub from '../common/eventHub' import store from '../store' import { mapState } from '@wepy/x' -import xiao4rBase from '../xiao4rBase' +import appManager from '../appManager' import xiao4rApis from '../apis/xiao4rApis' import validateUtils from '../js/utils/validateUtils' @@ -154,12 +154,12 @@ wepy.page({ async onNext() { if (!this.wineryForm.personName) { - xiao4rBase.showToast('请输入您的姓名!') + appManager.showToast('请输入您的姓名!') return } if (!validateUtils.isEmail(this.wineryForm.email)) { - xiao4rBase.showToast('请正确输入您的邮箱!') + appManager.showToast('请正确输入您的邮箱!') return } @@ -167,20 +167,20 @@ wepy.page({ if (this.wineryForm.slogan === '其他') { form.slogan = this.slogan } - form.openid = xiao4rBase.getOpenid() + form.openid = appManager.getOpenid() wx.showLoading({ title: '正在提交...', mask: true }) try { let rsp = await xiao4rApis.postForm(form) if (rsp.code === 200) { - xiao4rBase.showToast('提交成功!') + appManager.showToast('提交成功!') wx.reLaunch({ url: 'index' }) } else { - xiao4rBase.showToast('提交失败.' + rsp.msg) + appManager.showToast('提交失败.' + rsp.msg) } } catch (e) { - xiao4rBase.showToast('提交失败.', e) + appManager.showToast('提交失败.', e) } finally { wx.hideLoading() diff --git a/mini-app/src/pages/index.wpy b/mini-app/src/pages/index.wpy index 6f77d018f..160a1cebb 100644 --- a/mini-app/src/pages/index.wpy +++ b/mini-app/src/pages/index.wpy @@ -43,7 +43,7 @@ import wepy from '@wepy/core' import eventHub from '../common/eventHub' import store from '../store' import { mapActions } from '@wepy/x' -import xiao4rBase from '../xiao4rBase' +import appManager from '../appManager' import xiao4rApis from '../apis/xiao4rApis' import userApis from '../apis/userApis' import request from '../js/request' @@ -90,7 +90,7 @@ wepy.page({ eventHub.$emit('app-launch', { a: 1 }, { b: 2 }) }, onNext() { - xiao4rBase.navigateTo('form1') + appManager.navigateTo('form1') // xiao4rApis.getAuthTest({ openid: store.state.user.openid }).then(r => { // wx.navigateToMiniProgram({ @@ -112,7 +112,7 @@ wepy.page({ if (rsp.data.openid) { self.init(rsp.data.openid) } else { - xiao4rBase.showToast('登录失败！' + res.errMsg) + appManager.showToast('登录失败！' + res.errMsg) wx.hideLoading() } }) @@ -120,7 +120,7 @@ wepy.page({ // console.log('中断请求,req:', req.taskId) }, fail(res) { - xiao4rBase.showToast('登录失败,正在重试.') + appManager.showToast('登录失败,正在重试.') wx.hideLoading() self.login() } @@ -130,12 +130,12 @@ wepy.page({ async init(openid) { let self = this - xiao4rBase.saveOpenid(openid) + appManager.saveOpenid(openid) wx.getUserInfo({ success(res) { self.setUserAction({ - openid: xiao4rBase.getOpenid(), + openid: appManager.getOpenid(), userInfo: res.userInfo }) } @@ -147,7 +147,7 @@ wepy.page({ async getForm() { try { - let rsp = await xiao4rApis.getForm({ openid: xiao4rBase.getOpenid() }) + let rsp = await xiao4rApis.getForm({ openid: appManager.getOpenid() }) if (rsp.code === 200) { let temp = rsp.data temp.region = temp.region.split(',') @@ -163,7 +163,7 @@ wepy.page({ this.setWineryFormAction(temp) } } catch (e) { - xiao4rBase.showToast('获取用户信息失败.' + e) + appManager.showToast('获取用户信息失败.' + e) } } }, diff --git a/mini-app/src/pages/mall/goods-detail.wpy b/mini-app/src/pages/mall/goods-detail.wpy index d78747b34..f6708860a 100644 --- a/mini-app/src/pages/mall/goods-detail.wpy +++ b/mini-app/src/pages/mall/goods-detail.wpy @@ -5,7 +5,6 @@ height: 536rpx; z-index: -10; - } @@ -23,7 +22,6 @@ module.exports.getTime = getTime;