Merge branch 'bd-dev' of 47.94.45.65:angelo/web-base-h5 into bd-test

This commit is contained in:
woody 2025-10-10 15:50:08 +08:00
commit 872b3eb6e8
2 changed files with 78 additions and 106 deletions

View File

@ -1,34 +1,34 @@
{
"name": "qyj_console",
"appid": "__UNI__31B4587",
"description": "",
"versionName": "1.0.0",
"versionCode": "100",
"transformPx": false,
"name" : "qyj_console",
"appid" : "__UNI__31B4587",
"description" : "",
"versionName" : "1.0.0",
"versionCode" : "100",
"transformPx" : false,
/* 5+App */
"app-plus": {
"usingComponents": true,
"nvueStyleCompiler": "uni-app",
"compilerVersion": 3,
"splashscreen": {
"alwaysShowBeforeRender": true,
"waiting": true,
"autoclose": true,
"delay": 0
"app-plus" : {
"usingComponents" : true,
"nvueStyleCompiler" : "uni-app",
"compilerVersion" : 3,
"splashscreen" : {
"alwaysShowBeforeRender" : true,
"waiting" : true,
"autoclose" : true,
"delay" : 0
},
/* */
"modules": {
"Bluetooth": {},
"Barcode": {},
"Camera": {},
"Fingerprint": {},
"FaceID": {}
"modules" : {
"Bluetooth" : {},
"Barcode" : {},
"Camera" : {},
"Fingerprint" : {},
"FaceID" : {}
},
/* */
"distribute": {
"distribute" : {
/* android */
"android": {
"permissions": [
"android" : {
"permissions" : [
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
@ -45,66 +45,67 @@
"<uses-feature android:name=\"android.hardware.camera\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
],
"abiFilters": [
"armeabi-v7a",
"arm64-v8a",
"x86"
]
"abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
},
/* ios */
"ios": {
"dSYMs": false
"ios" : {
"dSYMs" : false
},
/* SDK */
"sdkConfigs": {
"push": {}
"sdkConfigs" : {
"push" : {}
}
}
},
/* */
"quickapp": {},
"quickapp" : {},
/* */
"mp-weixin": {
"appid": "wxe26d23c09932e93b",
"setting": {
"urlCheck": false,
"es6": false,
"minified": false
"mp-weixin" : {
"appid" : "wxe26d23c09932e93b",
"setting" : {
"urlCheck" : false,
"es6" : false,
"minified" : false
},
"usingComponents": true
"usingComponents" : true
},
"mp-alipay": {
"usingComponents": true
"mp-alipay" : {
"usingComponents" : true
},
"mp-baidu": {
"usingComponents": true
"mp-baidu" : {
"usingComponents" : true
},
"mp-toutiao": {
"usingComponents": true
"mp-toutiao" : {
"usingComponents" : true
},
"uniStatistics": {
"enable": false
"uniStatistics" : {
"enable" : false
},
"vueVersion": "2",
"h5": {
"template": "index.html",
"router": {
"mode": "hash"
"vueVersion" : "2",
"h5" : {
"template" : "index.html",
"router" : {
"mode" : "hash"
},
"devServer": {
"https": false,
"port": 8000,
"disableHostCheck": true,
"proxy": {
"/prod-api": {
"target": "http://192.168.0.104:8080",
"changeOrigin": true,
"pathRewrite": {
"^/prod-api": ""
"devServer" : {
"https" : false,
"port" : 8000,
"disableHostCheck" : true,
"proxy" : {
"/prod-api" : {
"target" : "http://192.168.0.104:8080",
"changeOrigin" : true,
"pathRewrite" : {
"^/prod-api" : ""
}
}
}
},
"optimization" : {
"treeShaking" : {
"enable" : true
}
}
},
"fallbackLocale": "zh-Hans"
"fallbackLocale" : "zh-Hans"
}

View File

@ -1,9 +1,9 @@
<template>
<view :class="userInfo.skin ? 'content1' : 'content'">
<view class="content">
<view class="content_a">
<!-- 商品专区入口 先别删 -->
<!-- <view @tap="goSpecialArea">会员专区</view> -->
<view :class="userInfo.skin ? 'index-top1' : 'index-top'"> </view>
<view class="index-top"> </view>
<view class="banner" v-if="isEmpty(goodsList.advertBannerList) == false">
<view class="uni-margin-wrap">
@ -60,14 +60,7 @@
ref="child"
:publishLocationIndex="10"
></notice-popup>
<!-- 植树弹窗
<getTree ref="tree"></getTree>
-->
<!-- 站内信弹窗 -->
<znNewsPopup
ref="child2"
@childMethodTrigger="callChildMethod"
></znNewsPopup>
<!-- 直推排行弹窗 -->
<RankingPopup
ref="rankingPopup"
@ -104,8 +97,6 @@ import * as ban from '@/config/balance.js'
import { getAreaGoods } from '@/config/special-area'
import clTabbar from '@/components/cl-tabbar.vue'
import noticePopup from '@/components/noticePopup.vue'
import getTree from '@/components/getTree.vue'
import znNewsPopup from '@/components/znNewsPopup.vue'
import areaProductList from '@/components/area-product-list/index.vue'
import { formatCurrency } from '@/util/index.js'
import { mapGetters } from 'vuex'
@ -116,9 +107,7 @@ import RankingPopup from '@/components/RankingPopup.vue'
export default {
components: {
noticePopup,
znNewsPopup,
'cl-tabbar': RaisedTabbar,
getTree,
areaProductList,
RegionSelect,
GoodsList,
@ -490,9 +479,6 @@ export default {
}
})
},
callznMethod() {
this.$refs.child2.getUserTc2()
},
noticePopupHandleClose() {
// this.$refs.regionSelect.getRegionSelect()
},
@ -686,15 +672,15 @@ export default {
}
}
}
.content1 {
background: url('~@/static/images/fBgd.jpg') no-repeat;
background-size: 100% 100%;
height: 100vh;
.content_a {
overflow: auto;
height: 100%;
}
}
// .content1 {
// background: url('~@/static/images/fBgd.jpg') no-repeat;
// background-size: 100% 100%;
// height: 100vh;
// .content_a {
// overflow: auto;
// height: 100%;
// }
// }
.more {
color: #333;
background-color: #fff;
@ -992,21 +978,6 @@ page {
padding: 30rpx 20rpx;
}
}
.index-top1 {
background: url('~@/static/images/tBgd.jpg') no-repeat;
background-size: 100% 100%;
// padding: 30rpx 20rpx; // height: 100rpx;
// background-color: #fff;
display: flex;
justify-content: space-between;
position: fixed;
z-index: 10;
width: 100%;
height: 100%;
.index_t {
padding: 30rpx 20rpx;
}
}
.index-right {
display: flex;