Skip to content

F
FuLiMini
Commit 4a170230 by wangjian
Options

Merge branch 'master' into dev

* master: 1 1 # Conflicts: # unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/home.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/mine.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/integral/integral.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/login/login.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/selectAccount/selectAccount.js.map # unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js.map # unpackage/dist/dev/mp-weixin/app.json # unpackage/dist/dev/mp-weixin/common/main.js # unpackage/dist/dev/mp-weixin/common/main.wxss # unpackage/dist/dev/mp-weixin/common/vendor.js # unpackage/dist/dev/mp-weixin/pages/home/home.js # unpackage/dist/dev/mp-weixin/pages/mine/mine.js # unpackage/dist/dev/mp-weixin/pages/mine/mine.json # unpackage/dist/dev/mp-weixin/pages/mine/mine.wxml # unpackage/dist/dev/mp-weixin/pages/order/order.js # unpackage/dist/dev/mp-weixin/pagesA/integral/integral.js # unpackage/dist/dev/mp-weixin/pagesA/login/login.js # unpackage/dist/dev/mp-weixin/pagesA/selectAccount/selectAccount.js # unpackage/dist/dev/mp-weixin/project.config.json # unpackage/dist/dev/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js
parents 1e1439d8 2b3f2dff
Showing with 421 additions and 29 deletions
App.vue
<script> <script>
import Vue from 'vue'
export default { export default {
onLaunch: function() { onLaunch: function() {
console.log('App Launch') console.log('App Launch')
let that = this
uni.getSystemInfo({
success: function(e) {
Vue.prototype.StatusBarHeight = e.statusBarHeight;
let custom = uni.getMenuButtonBoundingClientRect();
Vue.prototype.Custom = custom;
Vue.prototype.CustomBarHeight = custom.height + (custom.top - e.statusBarHeight) * 2;
Vue.prototype.BarPadding = custom.top;
Vue.prototype.SafeAreaBottom = e.safeAreaInsets.top>20 && e.platform!='android' ? 28 : 0
Vue.prototype.LRScreenWidth = e.screenWidth;
Vue.prototype.LRScreenHeight = e.screenHeight;
}
})
uni.hideShareMenu({});
}, },
onShow: function() { onShow: function() {
console.log('App Show') console.log('App Show')
......
pages.json
...@@ -23,7 +23,9 @@ ...@@ -23,7 +23,9 @@
"style" : "style" :
{ {
"navigationBarTitleText": "", "navigationBarTitleText": "",
"enablePullDownRefresh": false "enablePullDownRefresh": false,
"navigationStyle": "custom",
"backgroundColor":"#F5F5F5"
} }
} }
......
pages/home/home.vue
<template> <template>
<view> <view>
<<<<<<< HEAD
<view class="layout"> <view class="layout">
<view class="title">懒人企业福利社</view> <view class="title">懒人企业福利社</view>
<view class="header"> <view class="header">
...@@ -23,10 +22,6 @@ ...@@ -23,10 +22,6 @@
</view> </view>
</view> </view>
<uni-load-more v-if="brandList.length>0" :status="loadingType"></uni-load-more> <uni-load-more v-if="brandList.length>0" :status="loadingType"></uni-load-more>
=======
<view class="" @click="goLogin()">
11111
>>>>>>> d5c91777203b7e81e24f3d0960a9eb78343180ea
</view> </view>
</view> </view>
</template> </template>
...@@ -35,15 +30,12 @@ ...@@ -35,15 +30,12 @@
export default { export default {
data() { data() {
return { return {
<<<<<<< HEAD
name: '', name: '',
integralCount: '', integralCount: '',
loadingType: 'more', loadingType: 'more',
brandList: [], brandList: [],
page: 1, page: 1,
pageSize: 20 pageSize: 20
=======
>>>>>>> d5c91777203b7e81e24f3d0960a9eb78343180ea
}; };
}, },
created() { created() {
...@@ -69,7 +61,6 @@ ...@@ -69,7 +61,6 @@
} }
</script> </script>
<<<<<<< HEAD
<style lang="scss"> <style lang="scss">
.layout { .layout {
width: 100%; width: 100%;
...@@ -160,8 +151,4 @@ ...@@ -160,8 +151,4 @@
} }
} }
} }
=======
<style lang="scss" scoped>
>>>>>>> d5c91777203b7e81e24f3d0960a9eb78343180ea
</style> </style>
pages/mine/mine.vue
<template> <template>
<view> <view class="container">
<view class="mine-header">
<view class="header-top">
<!--navBar-->
<view class="nav-bar" :style="{ height: height + 'px', 'padding-top': statusBarHeight + 'px' }"><text class="person-center">我的</text></view>
<view class="user-info">
<view class="top">
<image class="avator" :src="userInfo.avatar" mode=""></image>
<view class="info">
<view class="name">{{userInfo.staffName}}</view>
<view class="shop">{{userInfo.accountName}}</view>
</view>
<view class="select-acccount" v-if="userInfo.allowSwitching>0">
切换行号
<image class="img" src="../../static/arrow-right-w.png" mode=""></image>
</view>
</view>
<view class="line"></view>
<view class="user-integral">
<view class="item">
<view class="num">{{userInfo.allIntegral}}</view>
<view class="bottom">累计积分</view>
</view>
<view class="item">
<view class="num">{{userInfo.surplusIntegral}}</view>
<view class="bottom">当前积分</view>
</view>
<view class="item">
<view class="num">{{userInfo.consumeIntegral}}</view>
<view class="bottom">消费积分</view>
</view>
</view>
</view>
</view>
<view class="bottom-setting">
<view class="item">
<view class="left">
<image class="left-img" src="../../static/coupon.png" mode=""></image>
<view class="title">卡片回收</view>
</view>
<image class="right-arrow" src="../../static/arrow-right.png" mode=""></image>
</view>
<view class="item">
<view class="left">
<image class="left-img" src="../../static/integral.png" mode=""></image>
<view class="title">积分明细</view>
</view>
<image class="right-arrow" src="../../static/arrow-right.png" mode=""></image>
</view>
<view class="item">
<view class="left">
<image class="left-img" src="../../static/customer.png" mode=""></image>
<view class="title">联系客服</view>
</view>
<image class="right-arrow" src="../../static/arrow-right.png" mode=""></image>
</view>
<view class="item last-item">
<view class="left">
<image class="left-img" src="../../static/setting.png" mode=""></image>
<view class="title">设置</view>
</view>
<image class="right-arrow" src="../../static/arrow-right.png" mode=""></image>
</view>
</view>
</view>
</view> </view>
</template> </template>
...@@ -8,7 +71,9 @@ ...@@ -8,7 +71,9 @@
export default { export default {
data() { data() {
return { return {
height: this.CustomBarHeight,
statusBarHeight: this.StatusBarHeight,
userInfo: {}
}; };
}, },
created() { created() {
...@@ -17,7 +82,12 @@ ...@@ -17,7 +82,12 @@
methods: { methods: {
getUserInfo() { getUserInfo() {
this.$net.get('/staff/detail').then(res => { this.$net.get('/staff/detail').then(res => {
if (res.code === 200) {
this.userInfo = res.data
this.$store.commit('refreshUserInfo', this.userInfo)
} else {
this.toast(res.message)
}
}) })
}, },
getImg() { getImg() {
...@@ -36,6 +106,152 @@ ...@@ -36,6 +106,152 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.container {
width: 100%;
height: 100%;
background-color: #F5F5F5;
position: fixed;
top: 0;
left: 0;
.mine-header {
width: 100%;
height: 392rpx;
display: flex;
flex-direction: column;
background-image: url(../../static/mine-bg.png);
background-size: 100% 100%;
.header-top {
top: 0;
position: sticky;
z-index: 999;
.nav-bar {
width: 100%;
display: flex;
align-items: center;
justify-content: center;
.person-center {
color: #ffffff;
font-size: 36upx;
text-align: center;
flex: 0.8;
}
}
}
.user-info {
margin: 30rpx auto 0;
// height: 312rpx;
padding-bottom: 34rpx;
width: 700rpx;
border-radius: 16rpx;
background-color: #FFFFFF;
.top {
display: flex;
position: relative;
height: 174rpx;
.avator {
margin-top: 30rpx;
margin-left: 30rpx;
height: 110rpx;
width: 110rpx;
border-radius: 110rpx;
}
.info {
margin-top: 50rpx;
margin-left: 20rpx;
width: 380rpx;
.name {
font-size: 32rpx;
color: #333333;
font-weight: bolder;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
.shop {
margin-top: 20rpx;
font-size: 24rpx;
color: #999999;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
}
.select-acccount {
top: 54rpx;
position: absolute;
right: 0;
width: 160rpx;
height: 50rpx;
display: flex;
justify-content: center;
align-items: center;
font-size: 24rpx;
color: #FFFFFF;
background-color: #FF7272;
border-radius: 25rpx 0 0 25rpx;
.img {
margin-left: 14rpx;
height: 20rpx;
width: 12rpx;
}
}
}
.user-integral {
margin: 0 70rpx;
display: flex;
justify-content: space-between;
border-top: 2rpx solid #F5F5F5;
.item {
text-align: center;
margin-top: 34rpx;
.num {
font-size: 36rpx;
color: #333333;
font-weight: bolder;
}
.bottom {
margin-top: 16rpx;
font-size: 24rpx;
color: #666666;
}
}
}
}
}
.bottom-setting {
margin: 30rpx 25rpx;
border-radius: 16rpx;
background-color: #FFFFFF;
.last-item {
border: none;
}
.item {
display: flex;
padding: 26rpx 30rpx;
align-items: center;
justify-content: space-between;
border-bottom: 2rpx solid#F5F5F5;
.left {
display: flex;
align-items: center;
.left-img {
height: 56rpx;
width: 56rpx;
display: block;
}
.title {
margin-left: 30rpx;
font-size: 30rpx;
color: #333333;
}
}
.right-arrow {
height: 20rpx;
width: 12rpx;
display: block;
}
}
}
}
</style> </style>
pagesA/login/login.vue
...@@ -98,10 +98,10 @@ ...@@ -98,10 +98,10 @@
this.toast('请输入验证码') this.toast('请输入验证码')
return return
} }
this.loading.showLoading('登录中...') this.loading.loadingShow('登录中...')
let params = {'authType':'code','authAccount':this.phone,'authPasswd':this.code, 'resetToken':'not'} let params = {'authType':'code','authAccount':this.phone,'authPasswd':this.code, 'resetToken':'not'}
this.$net.post('/auth/authorization', params).then(res => { this.$net.post('/auth/authorization', params).then(res => {
this.loading.hideLoading() this.loading.loadingHide()
if (res.code === 200) { if (res.code === 200) {
this.$net.tokenSave(res.data.token || '') this.$net.tokenSave(res.data.token || '')
if (res.date&&res.date.list) { if (res.date&&res.date.list) {
...@@ -115,10 +115,10 @@ ...@@ -115,10 +115,10 @@
}, },
liteLogin(liteCode) { liteLogin(liteCode) {
this.showGetPhoneBtn = false this.showGetPhoneBtn = false
this.loading.showLoading('登录中...') this.loading.loadingShow('登录中...')
let params = {'authType':'lite','authAccount':liteCode, 'resetToken':'not'} let params = {'authType':'lite','authAccount':liteCode, 'resetToken':'not'}
this.$net.post('/auth/authorization', params).then(res => { this.$net.post('/auth/authorization', params).then(res => {
this.loading.hideLoading() this.loading.loadingHide()
if (res.code === 200) { if (res.code === 200) {
this.$net.tokenSave(res.data.token || '') this.$net.tokenSave(res.data.token || '')
if (res.date&&res.date.list) { if (res.date&&res.date.list) {
......
store/index.js
...@@ -9,11 +9,17 @@ const store = new Vuex.Store({ ...@@ -9,11 +9,17 @@ const store = new Vuex.Store({
import { createStore } from 'vuex' import { createStore } from 'vuex'
const store = createStore({ const store = createStore({
// #endif // #endif
state: { state: {
isLogin: false,
userInfo: {}
}, },
mutations: { mutations: {
refreshUserLogin(state, isLogin) {
state.isLogin = isLogin
},
refreshUserInfo(state, info) {
state.userInfo = info
},
}, },
getters: { getters: {
......
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map 0 → 100644
{"version":3,"sources":["uni-app:///main.js","webpack:////Users/wangjian/Desktop/HBuilder/FuLiMini/App.vue?6d3e","webpack:////Users/wangjian/Desktop/HBuilder/FuLiMini/App.vue?32b3","uni-app:///App.vue","webpack:////Users/wangjian/Desktop/HBuilder/FuLiMini/App.vue?1c5c","webpack:////Users/wangjian/Desktop/HBuilder/FuLiMini/App.vue?c547"],"names":["wx","__webpack_require_UNI_MP_PLUGIN__","__webpack_require__","Vue","config","productionTip","App","mpType","prototype","$net","net","$router","router","$numUtils","numUtils","toast","loading","app","$mount"],"mappings":";;;;;;;;;iDAAA,wCAA8E;AAC9E;AACA;AACA;AACA;AACA;AACA;;;AAGA,qE,wnCATmBA,EAAE,CAACC,iCAAH,GAAuCC,mBAAvC;AAUnBC,aAAIC,MAAJ,CAAWC,aAAX,GAA2B,KAA3B;AACAC,aAAIC,MAAJ,GAAa,KAAb;AACAJ,aAAIK,SAAJ,CAAcC,IAAd,GAAqBC,YAArB;AACAP,aAAIK,SAAJ,CAAcG,OAAd,GAAwBC,eAAxB;AACAT,aAAIK,SAAJ,CAAcK,SAAd,GAA0BC,gBAA1B;AACAX,aAAIK,SAAJ,CAAcO,KAAd,GAAsBA,cAAtB;AACAZ,aAAIK,SAAJ,CAAcQ,OAAd,GAAwBA,gBAAxB;AACA,IAAMC,GAAG,GAAG,IAAId,YAAJ;AACLG,YADK,EAAZ;;AAGA,UAAAW,GAAG,EAACC,MAAJ,G;;;;;;;;;;;;;;;;;ACpBA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA;AACuD;AACL;AACa;;;AAG/D;AAC0M;AAC1M,gBAAgB,iNAAU;AAC1B,EAAE,yEAAM;AACR;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACe,gF;;;;;;;;;;;ACvBf;AAAA;AAAA;AAAA;AAAmyB,CAAgB,iyBAAG,EAAC,C;;;;;;;;;;;;ACCvzB,qE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAVA;;AAYA;AACA,GAjBA;AAkBA;AACA;AACA,GApBA;AAqBA;AACA;AACA,GAvBA,E;;;;;;;;;;;;ACFA;AAAA;AAAA;AAAA;AAAooC,CAAgB,8lCAAG,EAAC,C;;;;;;;;;;ACAxpC;AACA,OAAO,KAAU,EAAE,kBAKd","file":"common/main.js","sourcesContent":["import 'uni-pages';wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;import App from './App'\nimport net from './common/net.js'\nimport store from './store/index.js'\nimport numUtils from './common/numUtil.js'\nimport router from './router/router.js'\nimport toast from './common/toast.js'\nimport loading from './common/loading.js'\n\n\nimport Vue from 'vue'\nVue.config.productionTip = false\nApp.mpType = 'app'\nVue.prototype.$net = net\nVue.prototype.$router = router\nVue.prototype.$numUtils = numUtils\nVue.prototype.toast = toast\nVue.prototype.loading = loading\nconst app = new Vue({\n ...App\n})\napp.$mount()","var render, staticRenderFns, recyclableRender, components\nvar renderjs\nimport script from \"./App.vue?vue&type=script&lang=js&\"\nexport * from \"./App.vue?vue&type=script&lang=js&\"\nimport style0 from \"./App.vue?vue&type=style&index=0&lang=css&\"\n\n\n/* normalize component */\nimport normalizer from \"!../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n script,\n render,\n staticRenderFns,\n false,\n null,\n null,\n null,\n false,\n components,\n renderjs\n)\n\ncomponent.options.__file = \"App.vue\"\nexport default component.exports","import mod from \"-!../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib/index.js!../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--12-1!../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./App.vue?vue&type=script&lang=js&\"; export default mod; export * from \"-!../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib/index.js!../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--12-1!../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./App.vue?vue&type=script&lang=js&\"","<script>\n\timport Vue from 'vue'\r\n\texport default {\r\n\t\tonLaunch: function() {\r\n\t\t\tconsole.log('App Launch')\n\t\t\tlet that = this\n\t\t\tuni.getSystemInfo({\n\t\t\t\tsuccess: function(e) { \n\t\t\t\t\tVue.prototype.StatusBarHeight = e.statusBarHeight;\n\t\t\t\t\tlet custom = uni.getMenuButtonBoundingClientRect();\n\t\t\t\t\tVue.prototype.Custom = custom;\n\t\t\t\t\tVue.prototype.CustomBarHeight = custom.height + (custom.top - e.statusBarHeight) * 2;\n\t\t\t\t\tVue.prototype.BarPadding = custom.top;\n\t\t\t\t\tVue.prototype.SafeAreaBottom = e.safeAreaInsets.top>20 && e.platform!='android' ? 28 : 0\n\t\t\t\t\tVue.prototype.LRScreenWidth = e.screenWidth;\n\t\t\t\t\tVue.prototype.LRScreenHeight = e.screenHeight;\n\t\t\t\t}\n\t\t\t})\n\t\t\tuni.hideShareMenu({});\r\n\t\t},\r\n\t\tonShow: function() {\r\n\t\t\tconsole.log('App Show')\r\n\t\t},\r\n\t\tonHide: function() {\r\n\t\t\tconsole.log('App Hide')\r\n\t\t}\r\n\t}\r\n</script>\r\n\r\n<style>\r\n\t/*每个页面公共css */\r\n</style>\n","import mod from \"-!../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--6-oneOf-1-0!../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--6-oneOf-1-1!../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--6-oneOf-1-2!../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/postcss-loader/src/index.js??ref--6-oneOf-1-3!../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./App.vue?vue&type=style&index=0&lang=css&\"; export default mod; export * from \"-!../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--6-oneOf-1-0!../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--6-oneOf-1-1!../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--6-oneOf-1-2!../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/postcss-loader/src/index.js??ref--6-oneOf-1-3!../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./App.vue?vue&type=style&index=0&lang=css&\"","// extracted by mini-css-extract-plugin\n if(module.hot) {\n // 1650265189836\n var cssReload = require(\"/Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/hmr/hotModuleReplacement.js\")(module.id, {\"hmr\":true,\"publicPath\":\"../../\",\"locals\":false});\n module.hot.dispose(cssReload);\n module.hot.accept(undefined, cssReload);\n }\n "],"sourceRoot":""}
\ No newline at end of file
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
unpackage/dist/dev/mp-weixin/app.json 0 → 100644
{
"pages": [
"pages/home/home",
"pages/order/order",
"pages/mine/mine"
],
"subPackages": [
{
"root": "pagesA",
"pages": [
"login/login",
"integral/integral",
"selectAccount/selectAccount"
]
}
],
"window": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "uni-app",
"navigationBarBackgroundColor": "#F8F8F8",
"backgroundColor": "#F8F8F8"
},
"tabBar": {
"color": "#686868",
"selectedColor": "#FF0520",
"borderStyle": "black",
"backgroundColor": "#ffffff",
"list": [
{
"pagePath": "pages/home/home",
"iconPath": "static/tabbar/home.png",
"selectedIconPath": "static/tabbar/home_h.png",
"text": "首页"
},
{
"pagePath": "pages/order/order",
"iconPath": "static/tabbar/order.png",
"selectedIconPath": "static/tabbar/order_h.png",
"text": "订单"
},
{
"pagePath": "pages/mine/mine",
"iconPath": "static/tabbar/mine.png",
"selectedIconPath": "static/tabbar/mine_h.png",
"text": "我的"
}
]
},
"preloadRule": {
"pagesA/login/login": {
"network": "all",
"packages": [
"__APP__"
]
}
},
"usingComponents": {}
}
\ No newline at end of file
unpackage/dist/dev/mp-weixin/common/vendor.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
unpackage/dist/dev/mp-weixin/pages/mine/mine.json 0 → 100644
{
"navigationBarTitleText": "",
"enablePullDownRefresh": false,
"navigationStyle": "custom",
"backgroundColor": "#F5F5F5",
"usingComponents": {}
}
\ No newline at end of file
unpackage/dist/dev/mp-weixin/pages/mine/mine.wxml 0 → 100644
<view class="container data-v-dcbcfe34"><view class="mine-header data-v-dcbcfe34"><view class="header-top data-v-dcbcfe34"><view class="nav-bar data-v-dcbcfe34" style="{{'height:'+(height+'px')+';'+('padding-top:'+(statusBarHeight+'px')+';')}}"><text class="person-center data-v-dcbcfe34">我的</text></view><view class="user-info data-v-dcbcfe34"><view class="top data-v-dcbcfe34"><image class="avator data-v-dcbcfe34" src="{{userInfo.avatar}}" mode></image><view class="info data-v-dcbcfe34"><view class="name data-v-dcbcfe34">{{userInfo.staffName}}</view><view class="shop data-v-dcbcfe34">{{userInfo.accountName}}</view></view><block wx:if="{{userInfo.allowSwitching>0}}"><view class="select-acccount data-v-dcbcfe34">切换行号<image class="img data-v-dcbcfe34" src="../../static/arrow-right-w.png" mode></image></view></block></view><view class="line data-v-dcbcfe34"></view><view class="user-integral data-v-dcbcfe34"><view class="item data-v-dcbcfe34"><view class="num data-v-dcbcfe34">{{userInfo.allIntegral}}</view><view class="bottom data-v-dcbcfe34">累计积分</view></view><view class="item data-v-dcbcfe34"><view class="num data-v-dcbcfe34">{{userInfo.surplusIntegral}}</view><view class="bottom data-v-dcbcfe34">当前积分</view></view><view class="item data-v-dcbcfe34"><view class="num data-v-dcbcfe34">{{userInfo.consumeIntegral}}</view><view class="bottom data-v-dcbcfe34">消费积分</view></view></view></view></view><view class="bottom-setting data-v-dcbcfe34"><view class="item data-v-dcbcfe34"><view class="left data-v-dcbcfe34"><image class="left-img data-v-dcbcfe34" src="../../static/coupon.png" mode></image><view class="title data-v-dcbcfe34">卡片回收</view></view><image class="right-arrow data-v-dcbcfe34" src="../../static/arrow-right.png" mode></image></view><view class="item data-v-dcbcfe34"><view class="left data-v-dcbcfe34"><image class="left-img data-v-dcbcfe34" src="../../static/integral.png" mode></image><view class="title data-v-dcbcfe34">积分明细</view></view><image class="right-arrow data-v-dcbcfe34" src="../../static/arrow-right.png" mode></image></view><view class="item data-v-dcbcfe34"><view class="left data-v-dcbcfe34"><image class="left-img data-v-dcbcfe34" src="../../static/customer.png" mode></image><view class="title data-v-dcbcfe34">联系客服</view></view><image class="right-arrow data-v-dcbcfe34" src="../../static/arrow-right.png" mode></image></view><view class="item last-item data-v-dcbcfe34"><view class="left data-v-dcbcfe34"><image class="left-img data-v-dcbcfe34" src="../../static/setting.png" mode></image><view class="title data-v-dcbcfe34">设置</view></view><image class="right-arrow data-v-dcbcfe34" src="../../static/arrow-right.png" mode></image></view></view></view></view>
\ No newline at end of file
unpackage/dist/dev/mp-weixin/project.config.json 0 → 100644
{
"description": "项目配置文件。",
"packOptions": {
"ignore": []
},
"setting": {
"urlCheck": false,
"es6": true,
"enhance": true,
"postcss": true,
"preloadBackgroundData": false,
"minified": true,
"newFeature": false,
"coverView": true,
"nodeModules": false,
"autoAudits": false,
"showShadowRootInWxmlPanel": true,
"scopeDataCheck": false,
"uglifyFileName": false,
"checkInvalidKey": true,
"checkSiteMap": true,
"uploadWithSourceMap": true,
"compileHotReLoad": false,
"lazyloadPlaceholderEnable": false,
"useMultiFrameRuntime": true,
"useApiHook": true,
"useApiHostProcess": true,
"babelSetting": {
"ignore": [],
"disablePlugins": [],
"outputPath": ""
},
"useIsolateContext": true,
"userConfirmedBundleSwitch": false,
"packNpmManually": false,
"packNpmRelationList": [],
"minifyWXSS": true,
"disableUseStrict": false,
"minifyWXML": true,
"showES6CompileOption": false,
"useCompilerPlugins": false,
"ignoreUploadUnusedFiles": true
},
"compileType": "miniprogram",
"libVersion": "",
"appid": "wxb1d546c13cb4f607",
"projectname": "FuLiMini",
"condition": {
"search": {
"list": []
},
"conversation": {
"list": []
},
"game": {
"list": []
},
"miniprogram": {
"list": []
}
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment