Compare commits

..

No commits in common. "872b3eb6e8d7e91393066e4e208c2b4a5e8014fc" and "6d5ce02d4d3bf24808482502e9c8dcb43c8c57ac" have entirely different histories.

2 changed files with 106 additions and 78 deletions

View File

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

View File

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