样式修改

This commit is contained in:
cclu 2023-03-27 17:18:01 +08:00
parent 5128d1ad58
commit 9d8d33930a
9 changed files with 129 additions and 27 deletions

View File

@ -1,5 +1,6 @@
<script> <script>
import Vue from 'vue' import Vue from 'vue'
import util from '@/common/utils'
import { import {
mapGetters, mapGetters,
mapActions, mapActions,
@ -15,7 +16,7 @@
...mapActions(['memberLogin','getLoginCode']), ...mapActions(['memberLogin','getLoginCode']),
...mapMutations(['setVisitChannels']), ...mapMutations(['setVisitChannels']),
}, },
onLaunch: function(options) { onLaunch: function(options) {
uni.getSystemInfo({ uni.getSystemInfo({
success: function(e) { success: function(e) {
// #ifndef MP // #ifndef MP

86
package-lock.json generated Normal file
View 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"
}
}
}
}

View File

@ -180,7 +180,7 @@
.screen-box .screen-unit { .screen-box .screen-unit {
display: flex; display: flex;
align-items: center; align-items: center;
width: 200rpx; /*width: 200rpx;*/
padding: 0 14rpx; padding: 0 14rpx;
line-height: 3; line-height: 3;
} }
@ -203,6 +203,6 @@
border-radius: 6rpx; border-radius: 6rpx;
} }
.mr20 { .mr20 {
margin: 0 30rpx 0 16rpx; /*margin: 0 30rpx 0 16rpx;*/
} }
</style> </style>

View File

@ -455,6 +455,12 @@
let _this = this let _this = this
const [reginList, totalData, busniessTypePie, busniessTradePie, busniessAreaPie, bayonetPie] = const [reginList, totalData, busniessTypePie, busniessTradePie, busniessAreaPie, bayonetPie] =
await anhuiYestodayRevenueData.getData(this.theRequest) // 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) { if (this.theRequest.GroupType !== 1010) {
this.regionList = reginList // reginListModel[] this.regionList = reginList // reginListModel[]
@ -1343,7 +1349,11 @@
.operation-c-list { .operation-c-list {
padding: 16rpx 32rpx; padding: 16rpx 32rpx;
} }
.operation-cl-unit{
display: flex;
justify-content: space-between;
align-items: center;
}
.operation-cl-unit1 { .operation-cl-unit1 {
width: 100%; width: 100%;
font-size: 26rpx; font-size: 26rpx;

View File

@ -129,7 +129,7 @@
</div> </div>
<div class="check-unit"> <div class="check-unit">
<text>商品均价</text> <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> </div>
<div class="uni-flex justify-around mode-content" style="padding-bottom: 24rpx;" v-if="provinceCode==620000"> <div class="uni-flex justify-around mode-content" style="padding-bottom: 24rpx;" v-if="provinceCode==620000">

View File

@ -25,6 +25,7 @@ const methods = {
// Revenue_Include: 1 // Revenue_Include: 1
} }
this.provinceCode = obj.ProvinceCode this.provinceCode = obj.ProvinceCode
console.log('requestParamas',requestParamas)
// 营收数据 // 营收数据
const data = await request.$webGet('CommercialApi/Revenue/GetRevenuePushList', requestParamas) const data = await request.$webGet('CommercialApi/Revenue/GetRevenuePushList', requestParamas)
if (data.Result_Code != 100) return if (data.Result_Code != 100) return

View File

@ -586,6 +586,7 @@
} }
this.$request.$get('getRevenuePush', arr).then(res => { this.$request.$get('getRevenuePush', arr).then(res => {
console.log('res',res)
_this.isLoading = false _this.isLoading = false
if (res.ResultCode != 100) { if (res.ResultCode != 100) {
uni.hideLoading() uni.hideLoading()
@ -700,7 +701,7 @@
}, },
operationFn(data, ohterData) { // operationFn(data, ohterData) { //
var _this = this; var _this = this;
console.log(1) console.log(1)
if (data.SHOWBUSINESSTRADE == 1) { // if (data.SHOWBUSINESSTRADE == 1) { //
var colors1 = ['#5E67B4', '#4E5699', '#75B7AD', '#AFB7E6']; var colors1 = ['#5E67B4', '#4E5699', '#75B7AD', '#AFB7E6'];
var SHOWBUSINESSTRADE = [ var SHOWBUSINESSTRADE = [
@ -1837,11 +1838,12 @@ console.log(1)
padding: 16rpx 32rpx; padding: 16rpx 32rpx;
} }
.operation-cl-unit { .operation-c-list .operation-cl-unit {
display: flex; width: 100%;
align-items: center; display: flex;
justify-content: space-between; align-items: center;
font-size: 26rpx; justify-content: space-between;
font-size: 26rpx;
} }
.operation-c-list .progress { .operation-c-list .progress {

View File

@ -135,6 +135,7 @@
menuItem menuItem
}, },
onLoad() { onLoad() {
console.log(this.user,1111)
this.loadMenuSetting() this.loadMenuSetting()
}, },
computed: { computed: {
@ -256,6 +257,7 @@
} }
}, },
async loadMenuSetting(){ // async loadMenuSetting(){ //
console.log(this.user)
this.membershipType = this.user.Membership_Type this.membershipType = this.user.Membership_Type
let res = await this.$request.$webGet("EShangApiMain/APPManage/GetWeChatAppletMenuList",{ let res = await this.$request.$webGet("EShangApiMain/APPManage/GetWeChatAppletMenuList",{
ModuleStatus: this.membershipType === 9999 ? '1,2' : '1', ModuleStatus: this.membershipType === 9999 ? '1,2' : '1',

View File

@ -6,7 +6,7 @@
<!-- <view class="desc">申请获取你的公开信息(昵称头像)</view> --> <!-- <view class="desc">申请获取你的公开信息(昵称头像)</view> -->
<button type="primary" class="btn" open-type="getUserInfo" @getuserinfo="bindGetUserInfo">微信授权</button> <button type="primary" class="btn" open-type="getUserInfo" @getuserinfo="bindGetUserInfo">微信授权</button>
</view> </view>
<view class="desc" v-else-if=""> <view class="desc" v-else>
<button type="primary" class="btn" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">快速登录账号</button> <button type="primary" class="btn" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">快速登录账号</button>
</view> </view>