mkm/nk-shop2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改供应页面样式不生效，修改视频上传最大限制为50m

Browse Source
This commit is contained in:
cc_zbp 2023-05-16 11:21:10 +08:00
parent d66e47d9ba
commit d5b5703f72
5 changed files with 504 additions and 805 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

248
components/zbpSwiper.vue
View File

@ -1,250 +1,3 @@
<<<<<<< HEAD
<template>
<view class="zbp-head-wrapper">
<view class="color-lump"></view>
<view class="bg-img">
<img :src="bgColor" alt="">
</view>
<view class="site-box flex_a_c_j_sb">
<view class="place_wrapper flex_a_c" @click="selectLocation">
<view class="iconfont icon-weizhi"></view>
<view class="town_name">{{street}}</view>
</view>
<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
<view class="iconfont icon-xiaoxi" style="color:#fff;"></view>
</navigator>
</view>
<!-- 搜索栏 -->
<navigator url="/pages/columnGoods/goods_search/index" hover-class="none" class="search_content flex_a_c_j_sb">
<view class="flex_a_c">
<view class="iconfont icon-sousuo"></view>
<input type="text" v-model="keyword" placeholder="搜索产品或店铺">
</view>
<button class="search_btn">搜索</button>
</navigator>
<!-- 轮播图 -->
<view class="supply_chains-head">
<swiper class="swiper l_center" @change="swiperChange" :indicator-dots="swiper.indicatorDots"
:autoplay="swiper.autoplay" :interval="swiper.interval" :duration="swiper.duration"
indicator-active-color="#fff">
<block v-for="(item,index) in swiper['url']" :key="index">
<swiper-item class="swi_item">
<u--image radius="15" :showLoading="true" :src="item.img" width="694.74rpx" height="242.11rpx"
mode="aspectFill">
</u--image>
</swiper-item>
</block>
</swiper>
</view>
<u-picker :defaultIndex="[0,0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
@cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
</view>
</template>
<script>
import { getArea, getStreet } from '@/api/article.js';
import { getIndexData, getDiy } from '@/api/api.js'
import { mapGetters } from 'vuex'
export default {
props: {
isSelectPlace: {
type: Boolean,
default: false
}
},
data() {
return {
showPicker: false,
columnData: [],
keyword: '',
street: '',
bgColor: '',
swiper: {
url: [{
img: ''
}],
indicatorDots: true, // 显示面板指示点
vertical: false, // 滑动方向是否为纵向
autoplay: true, // 是否自动切换
interval: 2000, // 自动切换时间间隔
duration: 400 // 滑动动画时长
},
}
},
computed: mapGetters(['location']),
watch: {},
created() {
this.getBanner()
this.Area()
const loca = JSON.parse(this.location)
this.street = loca.address_component.street
},
methods: {
selectLocation() {
this.isSelectPlace ? this.showPicker = true : ''
},
confirm(e) {
this.showPicker = false
this.$emit('selectPlce', e)
},
changeHandler(e) {
const { columnIndex, value, values, index, picker = this.$refs.uPicker } = e;
if (columnIndex === 0) {
getStreet({ area_code: value[0]['code'] }).then(res => {
picker.setColumnValues(1, res.data);
});
}
},
Area() {
getArea({ city_code: 510500 }).then(res => {
this.$refs.uPicker.setColumnValues(0, res.data);
this.Street(res.data[0]['code']);
});
},
Street(code) {
getStreet({ area_code: code }).then(res => {
this.$refs.uPicker.setColumnValues(1, res.data);
});
},
swiperChange(e) {
let { current, source } = e.detail;
if (source === 'autoplay' || source === 'touch') {
this.bgColor = this.swiper.url[e.detail.current]['img']
}
},
async getBanner() {
const { data } = await getDiy({ id: 0 })
/* 对象转数组*/
let obj = Object.keys(data.value).sort();
let styleConfig = obj.map(key => data.value[key]);
/* 循环数组得到数据*/
styleConfig.forEach((item, index, arr) => {
if (item.name == 'headerSerch' || item.name == 'homeComb') {
item.name == 'homeComb' ? this.swiper.url = item.swiperConfig.list : '';
}
})
this.bgColor = this.swiper.url[0].img
},
}
}
</script>
<style lang="scss">
.zbp-head-wrapper {
position: relative;
padding-top: 78.95rpx;
overflow: hidden;
.color-lump {
z-index: 1;
position: absolute;
bottom: -86px;
left: 50%;
transform: translate(-50%, 0);
width: 102%;
height: 133px;
border-radius: 30px 30px 0 0;
background-color: #fff;
}
.bg-img {
position: absolute;
width: 100%;
height: 100%;
top: 0;
/* #ifdef MP || APP-PLUS */
z-index: -1;
/* #endif */
/* #ifdef H5 */
z-index: 0;
/* #endif */
z-index: 0;
filter: blur(0);
overflow: hidden;
img {
width: 100%;
height: 100%;
filter: blur(30rpx);
transform: scale(1.5);
}
}
.site-box {
margin: 0 auto;
width: 694.74rpx;
height: 66.67rpx;
margin-bottom: 26.32rpx;
position: relative;
// 位置
.place_wrapper {
color: #fff;
margin-right: 24.56rpx;
font-size: 31.58rpx;
.town_name {
margin-left: 10.53rpx;
}
}
.iconfont {
font-size: 35.09rpx;
}
}
.my-main {
transition: background-color .5s ease;
}
.search_content {
margin: 0 auto;
width: 694.74rpx;
height: 61.4rpx;
padding: 2px 2px 2px 21.05rpx;
border-radius: 100px;
background: #fff;
margin-bottom: 17.54rpx;
position: relative;
box-sizing: border-box;
.icon-sousuo {
font-size: 26.32rpx;
font-weight: bold;
color: #c8c7c6;
margin-right: 17.54rpx;
}
.search_btn {
color: #fff;
width: 105.26rpx;
height: 52.63rpx;
line-height: 52.63rpx;
background: #f84221;
border-radius: 100px;
font-size: 28.07rpx;
}
}
.supply_chains-head {
margin-bottom: 17.54rpx;
position: relative;
z-index: 2;
.swiper {
width: 694.74rpx;
height: 242.11rpx;
margin: 0 auto;
.swi_item {
width: 100%;
height: 242.11rpx;
}
}
}
}
</style>
=======
<template>
<view class="zbp-head-wrapper">
<view class="color-lump"></view>
@ -566,4 +319,3 @@
}
}
</style>
>>>>>>> a46be7373a3ace79168d4e9e55683ef59cd9db8d

36
config/app.js
View File

@ -8,26 +8,26 @@ let httpApiTwo
let httpApiThree
// 网络接口修改此字符 小程序域名要求https
// let httpApi = 'http://192.168.31.110:8324' //测试
httpApi = 'https://shop.lihaink.cn' //生产
// httpApi = 'https://shop.lihaink.cn' //生产
// httpApi = 'http://192.168.0.222:8324' //生产
httpApiTwo = 'https://nk.lihaink.cn' //生产
// httpApiTwo = 'https://nk.lihaink.cn' //生产
// if (process.env.NODE_ENV === "development") {
// httpApi = "https://crmeb-test.shop.lihaink.cn"
// // #ifdef MP-WEIXIN
// httpApiTwo = "http://cms.com"
// httpApiThree = 'http://ceshi-oa.lihaink.cn'
// // #endif
// // #ifdef H5
// // httpApiTwo = "baseUrl" // h5跨域配置
// httpApiTwo = "https://nk.lihaink.cn" // h5跨域配置
// // httpApiThree = 'baseUrlTest' // h5跨域配置
// // #endif
// } else if (process.env.NODE_ENV === 'production') {
// httpApi = 'https://shop.lihaink.cn' // 生产
// httpApiTwo = 'https://nk.lihaink.cn' // 生产
// httpApiThree = 'http://ceshi-oa.lihaink.cn' //生产
// }
if (process.env.NODE_ENV === "development") {
httpApi = "https://crmeb-test.shop.lihaink.cn"
// #ifdef MP-WEIXIN
httpApiTwo = "http://cms.com"
httpApiThree = 'http://ceshi-oa.lihaink.cn'
// #endif
// #ifdef H5
// httpApiTwo = "baseUrl" // h5跨域配置
httpApiTwo = "https://nk.lihaink.cn" // h5跨域配置
// httpApiThree = 'baseUrlTest' // h5跨域配置
// #endif
} else if (process.env.NODE_ENV === 'production') {
httpApi = 'https://shop.lihaink.cn' // 生产
httpApiTwo = 'https://nk.lihaink.cn' // 生产
httpApiThree = 'http://ceshi-oa.lihaink.cn' //生产
}
// 聊天接口修改此字符 小程序聊天要求wss 例如：wss://mer.crmeb.net
// let wsApi = 'ws://192.168.3.20:8324'

960
pages/home/index.vue
View File

File diff suppressed because it is too large Load Diff

2
pages/plant_release/index.vue
View File

@ -176,7 +176,7 @@
id: "",
order_id: "",
imgName: "",
upload_max: 10,
upload_max: 50,
uploadUrl: `${HTTP_REQUEST_URL}/api/upload/video`,
tabList: [
{ name: '图文', value: 1, icon: 'icon-tuwen' },

63
pages/supply_chains/supply_chains.vue
View File

@ -36,7 +36,7 @@
</view>
<view class="tabs_wrapper">
<u-tabs :list="tabsData.list" @click="tabsChange" keyName="title"></u-tabs>
<u-tabs :list="tabsData.list" @click="tabsChange" keyName="title" lineColor="#F84221"></u-tabs>
</view>
<view class="goods">
@ -163,21 +163,6 @@
</script>
<style lang="scss" scoped>
page {
background-color: #F5F5F5;
}
.Circle_friends {
position: relative;
padding: 0 0 87.72rpx 0;
background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%);
}
.circle_friends_wrapper {
position: relative;
z-index: 2;
}
.shop_wrapper {
height: 192.98rpx;
width: 694.74rpx;
@ -260,10 +245,24 @@
}
}
.scroll_art {
.tabs_wrapper {
width: 694.74rpx;
margin: 0 auto;
height: 526.32rpx
margin: 38.6rpx auto;
margin-bottom: 21.05rpx;
.title {
font-size: 31.58rpx;
font-weight: bold;
&::before {
content: '';
display: inline-block;
width: 3px;
height: 31.58rpx;
background-color: #F84221;
margin-right: 7.02rpx;
}
}
}
.article_box {
@ -319,32 +318,6 @@
}
}
.tabs_wrapper {
width: 694.74rpx;
margin: 38.6rpx auto;
margin-bottom: 21.05rpx;
.title {
font-size: 31.58rpx;
font-weight: bold;
&::before {
content: '';
display: inline-block;
width: 3px;
height: 31.58rpx;
background-color: #F84221;
margin-right: 7.02rpx;
}
}
}
.empty_wrapper {
display: flex;
align-items: center;
justify-content: center;
}
.goods {
margin: 0 auto;
width: 694.74rpx;