样式修改
This commit is contained in:
parent
5128d1ad58
commit
9d8d33930a
3
App.vue
3
App.vue
@ -1,5 +1,6 @@
|
||||
<script>
|
||||
import Vue from 'vue'
|
||||
import util from '@/common/utils'
|
||||
import {
|
||||
mapGetters,
|
||||
mapActions,
|
||||
@ -15,7 +16,7 @@
|
||||
...mapActions(['memberLogin','getLoginCode']),
|
||||
...mapMutations(['setVisitChannels']),
|
||||
},
|
||||
onLaunch: function(options) {
|
||||
onLaunch: function(options) {
|
||||
uni.getSystemInfo({
|
||||
success: function(e) {
|
||||
// #ifndef MP
|
||||
|
||||
86
package-lock.json
generated
Normal file
86
package-lock.json
generated
Normal file
@ -0,0 +1,86 @@
|
||||
{
|
||||
"name": "wechat_yxcl",
|
||||
"lockfileVersion": 2,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"dependencies": {
|
||||
"vuex-persistedstate": "^4.1.0"
|
||||
}
|
||||
},
|
||||
"node_modules/deepmerge": {
|
||||
"version": "4.2.2",
|
||||
"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
|
||||
"integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
|
||||
"engines": {
|
||||
"node": ">=0.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/shvl": {
|
||||
"version": "2.0.3",
|
||||
"resolved": "https://registry.npmjs.org/shvl/-/shvl-2.0.3.tgz",
|
||||
"integrity": "sha512-V7C6S9Hlol6SzOJPnQ7qzOVEWUQImt3BNmmzh40wObhla3XOYMe4gGiYzLrJd5TFa+cI2f9LKIRJTTKZSTbWgw=="
|
||||
},
|
||||
"node_modules/vue": {
|
||||
"version": "2.6.14",
|
||||
"resolved": "https://registry.npmjs.org/vue/-/vue-2.6.14.tgz",
|
||||
"integrity": "sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ==",
|
||||
"peer": true
|
||||
},
|
||||
"node_modules/vuex": {
|
||||
"version": "3.6.2",
|
||||
"resolved": "https://registry.npmjs.org/vuex/-/vuex-3.6.2.tgz",
|
||||
"integrity": "sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw==",
|
||||
"peer": true,
|
||||
"peerDependencies": {
|
||||
"vue": "^2.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/vuex-persistedstate": {
|
||||
"version": "4.1.0",
|
||||
"resolved": "https://registry.npmjs.org/vuex-persistedstate/-/vuex-persistedstate-4.1.0.tgz",
|
||||
"integrity": "sha512-3SkEj4NqwM69ikJdFVw6gObeB0NHyspRYMYkR/EbhR0hbvAKyR5gksVhtAfY1UYuWUOCCA0QNGwv9pOwdj+XUQ==",
|
||||
"dependencies": {
|
||||
"deepmerge": "^4.2.2",
|
||||
"shvl": "^2.0.3"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"vuex": "^3.0 || ^4.0.0-rc"
|
||||
}
|
||||
}
|
||||
},
|
||||
"dependencies": {
|
||||
"deepmerge": {
|
||||
"version": "4.2.2",
|
||||
"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
|
||||
"integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="
|
||||
},
|
||||
"shvl": {
|
||||
"version": "2.0.3",
|
||||
"resolved": "https://registry.npmjs.org/shvl/-/shvl-2.0.3.tgz",
|
||||
"integrity": "sha512-V7C6S9Hlol6SzOJPnQ7qzOVEWUQImt3BNmmzh40wObhla3XOYMe4gGiYzLrJd5TFa+cI2f9LKIRJTTKZSTbWgw=="
|
||||
},
|
||||
"vue": {
|
||||
"version": "2.6.14",
|
||||
"resolved": "https://registry.npmjs.org/vue/-/vue-2.6.14.tgz",
|
||||
"integrity": "sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ==",
|
||||
"peer": true
|
||||
},
|
||||
"vuex": {
|
||||
"version": "3.6.2",
|
||||
"resolved": "https://registry.npmjs.org/vuex/-/vuex-3.6.2.tgz",
|
||||
"integrity": "sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw==",
|
||||
"peer": true,
|
||||
"requires": {}
|
||||
},
|
||||
"vuex-persistedstate": {
|
||||
"version": "4.1.0",
|
||||
"resolved": "https://registry.npmjs.org/vuex-persistedstate/-/vuex-persistedstate-4.1.0.tgz",
|
||||
"integrity": "sha512-3SkEj4NqwM69ikJdFVw6gObeB0NHyspRYMYkR/EbhR0hbvAKyR5gksVhtAfY1UYuWUOCCA0QNGwv9pOwdj+XUQ==",
|
||||
"requires": {
|
||||
"deepmerge": "^4.2.2",
|
||||
"shvl": "^2.0.3"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -180,7 +180,7 @@
|
||||
.screen-box .screen-unit {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
width: 200rpx;
|
||||
/*width: 200rpx;*/
|
||||
padding: 0 14rpx;
|
||||
line-height: 3;
|
||||
}
|
||||
@ -203,6 +203,6 @@
|
||||
border-radius: 6rpx;
|
||||
}
|
||||
.mr20 {
|
||||
margin: 0 30rpx 0 16rpx;
|
||||
/*margin: 0 30rpx 0 16rpx;*/
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -455,6 +455,12 @@
|
||||
let _this = this
|
||||
const [reginList, totalData, busniessTypePie, busniessTradePie, busniessAreaPie, bayonetPie] =
|
||||
await anhuiYestodayRevenueData.getData(this.theRequest) // 获取实时数据
|
||||
console.log('reginList',reginList)
|
||||
console.log('totalData',totalData)
|
||||
console.log('busniessTypePie',busniessTypePie)
|
||||
console.log('busniessTradePie',busniessTradePie)
|
||||
console.log('busniessAreaPie',busniessAreaPie)
|
||||
console.log('bayonetPie',bayonetPie)
|
||||
|
||||
if (this.theRequest.GroupType !== 1010) {
|
||||
this.regionList = reginList // 营收上传列表 reginListModel[]
|
||||
@ -1343,7 +1349,11 @@
|
||||
.operation-c-list {
|
||||
padding: 16rpx 32rpx;
|
||||
}
|
||||
|
||||
.operation-cl-unit{
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
}
|
||||
.operation-cl-unit1 {
|
||||
width: 100%;
|
||||
font-size: 26rpx;
|
||||
|
||||
@ -129,7 +129,7 @@
|
||||
</div>
|
||||
<div class="check-unit">
|
||||
<text>商品均价</text>
|
||||
<div class="check-price-color">{{$util.fmoney(headMsg.countave,2)}} <text>元</text></div>
|
||||
<div class="check-price-color">{{$util.fmoney(headMsg.countave,2) }} <text>元</text></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="uni-flex justify-around mode-content" style="padding-bottom: 24rpx;" v-if="provinceCode==620000">
|
||||
|
||||
@ -24,7 +24,8 @@ const methods = {
|
||||
SPRegionType_ID: obj.GroupType == 1020 ? obj.ServerpartIds : '',
|
||||
// Revenue_Include: 1
|
||||
}
|
||||
this.provinceCode = obj.ProvinceCode
|
||||
this.provinceCode = obj.ProvinceCode
|
||||
console.log('requestParamas',requestParamas)
|
||||
// 营收数据
|
||||
const data = await request.$webGet('CommercialApi/Revenue/GetRevenuePushList', requestParamas)
|
||||
if (data.Result_Code != 100) return
|
||||
|
||||
@ -586,6 +586,7 @@
|
||||
}
|
||||
|
||||
this.$request.$get('getRevenuePush', arr).then(res => {
|
||||
console.log('res',res)
|
||||
_this.isLoading = false
|
||||
if (res.ResultCode != 100) {
|
||||
uni.hideLoading()
|
||||
@ -700,7 +701,7 @@
|
||||
},
|
||||
operationFn(data, ohterData) { //昨日营收占比
|
||||
var _this = this;
|
||||
console.log(1)
|
||||
console.log(1)
|
||||
if (data.SHOWBUSINESSTRADE == 1) { // 业态营收占比
|
||||
var colors1 = ['#5E67B4', '#4E5699', '#75B7AD', '#AFB7E6'];
|
||||
var SHOWBUSINESSTRADE = [
|
||||
@ -1837,11 +1838,12 @@ console.log(1)
|
||||
padding: 16rpx 32rpx;
|
||||
}
|
||||
|
||||
.operation-cl-unit {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
font-size: 26rpx;
|
||||
.operation-c-list .operation-cl-unit {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
font-size: 26rpx;
|
||||
}
|
||||
|
||||
.operation-c-list .progress {
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
<view class="content" v-show="menus">
|
||||
<menuModel v-for="(menu ,index) in modelMenu" :key="index" :title="menu.name" :class="{'line-block':index!=0}">
|
||||
<view class="uni-flex align-top" name="slot">
|
||||
<menuItem
|
||||
<menuItem
|
||||
v-for="item in menu.list"
|
||||
:key="item.id"
|
||||
:item ="item"
|
||||
:doCout="toDoMsg ? toDoMsg[item.id] : 0"
|
||||
:active="1"
|
||||
@handleClick="toPage"
|
||||
|
||||
@handleClick="toPage"
|
||||
|
||||
></menuItem>
|
||||
</view>
|
||||
</menuModel>
|
||||
@ -33,7 +33,7 @@
|
||||
|
||||
<text class="menu-text" :class="{'noFn': !menus[item.id] || menus[item.id]==0}">{{item.name}}</text>
|
||||
</view>
|
||||
|
||||
|
||||
</div>
|
||||
</view>
|
||||
<view class="line-block"></view>
|
||||
@ -72,9 +72,9 @@
|
||||
:active="menus[item.id]"
|
||||
@tap="toPage(item)"
|
||||
>
|
||||
|
||||
|
||||
</menuItem>
|
||||
|
||||
|
||||
<view class="model-c-menu" v-for="item in sceneMode" hover-class="navigator-hover" :key="item.id" @tap="toPage(item)">
|
||||
|
||||
<image :src="menus[item.id]==1?item.imagePath:item.noImagePath" mode="aspectFill"></image>
|
||||
@ -89,7 +89,7 @@
|
||||
|
||||
<text class="menu-text" :class="{'noFn': !user.Membership_Id}">扫一扫</text>
|
||||
</view>
|
||||
|
||||
|
||||
</div>
|
||||
</view>
|
||||
<view class="line-block"></view>
|
||||
@ -98,7 +98,7 @@
|
||||
<text class="text">商业经营</text>
|
||||
</div>
|
||||
<div class="model-content">
|
||||
|
||||
|
||||
<view class="model-c-menu" v-for="item in managementMode" hover-class="navigator-hover" :key="item.id" @tap="toPage(item)">
|
||||
|
||||
<image :src="menus[item.id]==1?item.imagePath:item.noImagePath" mode="aspectFill"></image>
|
||||
@ -116,7 +116,7 @@
|
||||
<script>
|
||||
import {
|
||||
mapState,
|
||||
|
||||
|
||||
mapMutations,
|
||||
mapActions
|
||||
} from 'vuex'
|
||||
@ -135,6 +135,7 @@
|
||||
menuItem
|
||||
},
|
||||
onLoad() {
|
||||
console.log(this.user,1111)
|
||||
this.loadMenuSetting()
|
||||
},
|
||||
computed: {
|
||||
@ -155,7 +156,7 @@
|
||||
return state.userData.AuthorityInfo
|
||||
}
|
||||
}),
|
||||
|
||||
|
||||
},
|
||||
methods: {
|
||||
...mapActions(['updateUser']),
|
||||
@ -172,9 +173,9 @@
|
||||
if (result.indexOf('http://eshangtech.com:8000/mbwa/index.html') > -1) {
|
||||
let mbwaId = res.result.split('?')[1]
|
||||
mbwaId = mbwaId.split('=')[1]
|
||||
|
||||
|
||||
_this.$util.toNextRoute('navigateTo', "/pages/mbwa/mbwaUpload?mbwaID=" + mbwaId)
|
||||
|
||||
|
||||
} else if (res.result.indexOf("http") > -1) {
|
||||
_this.$util.toNextRoute('navigateTo', "/pages/webview/webview?src=" +
|
||||
encodeURIComponent(res.result))
|
||||
@ -227,7 +228,7 @@
|
||||
toPage(item) {
|
||||
|
||||
let _this = this
|
||||
|
||||
|
||||
if (!this.user.Membership_Phone) {
|
||||
uni.showModal({
|
||||
title: ' 温馨提示',
|
||||
@ -256,6 +257,7 @@
|
||||
}
|
||||
},
|
||||
async loadMenuSetting(){ //加载首页菜单配置
|
||||
console.log(this.user)
|
||||
this.membershipType = this.user.Membership_Type
|
||||
let res = await this.$request.$webGet("EShangApiMain/APPManage/GetWeChatAppletMenuList",{
|
||||
ModuleStatus: this.membershipType === 9999 ? '1,2' : '1',
|
||||
@ -288,7 +290,7 @@
|
||||
<style scoped>
|
||||
.line-block {
|
||||
border-top: 13rpx solid #F5F5F5;
|
||||
|
||||
|
||||
}
|
||||
|
||||
.content {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
<!-- <view class="desc">申请获取你的公开信息(昵称、头像)</view> -->
|
||||
<button type="primary" class="btn" open-type="getUserInfo" @getuserinfo="bindGetUserInfo">微信授权</button>
|
||||
</view>
|
||||
<view class="desc" v-else-if="">
|
||||
<view class="desc" v-else>
|
||||
|
||||
<button type="primary" class="btn" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">快速登录账号</button>
|
||||
</view>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user