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

三个页面修改

Browse Source
This commit is contained in:
THK3121 2023-09-06 11:24:37 +08:00
commit b30dcdb78f
18 changed files with 1850 additions and 1839 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
App.vue
View File

@ -77,6 +77,7 @@
this.globalData.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
this.globalData.uid = this.$store.state.app.uid;
// #ifdef APP-PLUS
//监听uni小程序发送的事件
mp.onUniMPEventReceive(ret => {
console.log('小程序事件: ', ret);
@ -86,6 +87,7 @@
});
}
});
// #endif
let that = this;
// #ifdef MP

2
components/WaterfallsFlow/WaterfallsFlowo.vue
View File

@ -101,7 +101,7 @@ export default {
if(this.mark < this.allList.length){
this.waterFall()
}
console.log(this.rightList,this.leftList)
}
},
immediate: true,

1
components/WaterfallsFlow/WaterfallsFlows.vue
View File

@ -108,7 +108,6 @@ export default {
deep:true
},
mounted(){
this.getUserInfo()
},

8
components/WaterfallsFlowItem/WaterfallsFlowItems.vue
View File

@ -1,16 +1,14 @@
<template>
<view class="wf-item-page" @click="gogogo(item)">
<image :src="item.image[0]" mode="widthFix" class="item-img" />
<view class="goods_item_img" v-if="item.video_link.length>0">
<image src="@/static/images/sp.png" mode="aspectFill"></image>
<image src="@/static/images/sp.png" mode="aspectFit"></image>
</view>
<view class="title">{{item.title}}</view>
<view class="item-info">
<image :src="(item.author && item.author.avatar) || '/static/images/f.png'" mode="aspectFill"
<image :src="(item.author && item.author.avatar) || '/static/images/f.png'" mode="aspectFit"
class="info-avatar" />
<view class="info-nickname">{{ item.author.nickname }}</view>
</view>
@ -41,7 +39,6 @@
this.getUserInfo()
},
methods: {
/**
* 获取个人用户信息
@ -62,7 +59,6 @@
url: `/pages/short_video/appSwiper/index?id=${item.community_id}&uid=${this.user_id}&user=1`
// #endif
})
} else {
uni.navigateTo({
url: `/pages/plantGrass/plant_detail/index?id=${item.community_id}`

9
pages.json
View File

@ -1529,7 +1529,6 @@
"selectedColor": "#E93323",
"borderStyle": "white",
"backgroundColor": "#ffffff",
"fontSize": "25rpx",
"list": [{
"pagePath": "pages/index/index",
"iconPath": "static/tabbar_icon/a.png",
@ -1564,13 +1563,11 @@
}
],
"midButton": {
"width": "78rpx",
"height": "126rpx",
"iconWidth": "78rpx",
"width": "68px",
"height": "70px",
"iconWidth": "48px",
"pagePath": "pages/plant_release/index",
"iconPath": "static/tabbar_icon/d.png",
// "selectedIconPath": "static/tabbar_icon/d-a.png",
"text": "发布"
}

1
pages/columnGoods/goods_list/index.vue
View File

@ -77,7 +77,6 @@
<view v-else class='list'>
<WaterfallsFlow :wfList='productList' @itemTap="godDetail" :type="1" @goShop="goShop"/>
</view>
<view class='noCommodity' v-if="productList.length==0 && where.page > 1">
<view class='pictrue' style="margin: 60rpx auto;">
<image src='/static/images/noCart.png'></image>

79
pages/gather/gather.vue
View File

@ -5,7 +5,8 @@
<view class="site-box flex_a_c_j_sb" :style="{'background-color':backColor}">
<view :class="['place_wrapper','flex_a_c',isFshow?'sitebox':'']" @click="selectLocation">
<view :class="['iconfont','icon-weizhi',isFshow?'sitebox':'']" style="color:#000;margin-left: 20rpx;">
<view :class="['iconfont','icon-weizhi',isFshow?'sitebox':'']"
style="color:#000;margin-left: 20rpx;">
</view>
<view class="town_name" style="color:#000;">{{street}}</view>
</view>
@ -21,18 +22,9 @@
</view>
<zbpSwiper
:isSelectPlace="true"
:location_Arr="locationArr"
:town="street"
@kkchange="kkchange"
></zbpSwiper>
<u-empty
:show="jurisdiction"
mode="permission"
:text="emptyText"
icon="http://cdn.uviewui.com/uview/empty/permission.png"
></u-empty>
<zbpSwiper :isSelectPlace="true" :location_Arr="locationArr" :town="street" @kkchange="kkchange"></zbpSwiper>
<u-empty :show="jurisdiction" mode="permission" :text="emptyText"
icon="http://cdn.uviewui.com/uview/empty/permission.png"></u-empty>
<view class="business com special_work" v-if="jurisdiction == false">
<view class="title project">
<view>更多功能</view>
@ -41,39 +33,19 @@
</view>
<view class="content">
<block v-if="nowMenuList.length > 0">
<u-transition
v-for="(item, index) in nowMenuList"
:key="item.name"
show
>
<view
class="examine"
@click="
<u-transition v-for="(item, index) in nowMenuList" :key="item.name" show>
<view class="examine" @click="
editFlag ? removeMenu(item) : clickMenu(item.type, item.data)
"
>
<image
class="icon_img"
:src="`${prefix}${item.icon}`"
mode="aspectFit"
>
">
<image class="icon_img" :src="item.icon" mode="aspectFit">
</image>
<u-icon
v-if="editFlag"
class="icon"
name="minus-circle-fill"
color="red"
></u-icon>
<u-icon v-if="editFlag" class="icon" name="minus-circle-fill" color="red"></u-icon>
<text class="text">{{ item.name }}</text>
</view>
</u-transition>
</block>
<view
v-else-if="!editFlag"
@click="editFlag = true"
style="text-align: center; width: 100%; color: #aaa"
>还没有应用,点我添加应用</view
>
<view v-else-if="!editFlag" @click="editFlag = true"
style="text-align: center; width: 100%; color: #aaa">还没有应用,点我添加应用</view>
</view>
</view>
<view v-if="editFlag" class="business com special_work edit_card">
@ -82,17 +54,9 @@
<view class="edit2" @click="editComfirm">完成</view>
</view>
<view class="content">
<u-transition
v-for="(item, index) in AllMenuList"
:key="item.name"
show
>
<u-transition v-for="(item, index) in AllMenuList" :key="item.name" show>
<view class="examine" @click="pushMenu(item)">
<image
class="icon_img"
:src="`${prefix}${item.icon}`"
mode="aspectFit"
>
<image class="icon_img" :src="item.icon" mode="aspectFit">
</image>
<u-icon class="icon" name="plus-circle-fill"></u-icon>
<text class="text">{{ item.name }}</text>
@ -142,7 +106,9 @@ import {
import {
getDiy
} from '@/api/api.js';
// #ifdef APP-PLUS
import uniMP from '@/utils/uniMP.js';
// #endif
export default {
components: {
@ -171,13 +137,13 @@ export default {
// 所有菜单的按钮
AllMenuList: [{
name: '商户平台',
icon: 'spgl.png',
icon: '/static/applet/shop_app.png',
data: '/pages/moreProject/moreProject',
type: 2,
},
{
name: '供销平台',
icon: 'shsz.png',
icon: '/static/applet/gx_app.png',
data: '__UNI__B5B1EDD',
type: 1,
},
@ -410,7 +376,8 @@ export default {
let street_id = res.data.address_reference.town.id
this.street = res.data.address_component.street
this.$nextTick(() => {
this.$bus.$emit('value-updated', this.street + ',' + street_id);
this.$bus.$emit('value-updated', this.street + ',' +
street_id);
})
@ -596,13 +563,13 @@ export default {
// margin: 0 0 33.33rpx 33.33rpx !important;
.icon_img {
width: 63.16rpx;
height: 63.16rpx;
width: 83.16rpx;
height: 83.16rpx;
}
.icon {
position: absolute;
top: 0rpx;
top: -5rpx;
right: 25rpx;
}

141
pages/index/index.vue
View File

@ -2,16 +2,29 @@
<view class="Circle_friends">
<view class="circle_friends_wrapper">
<view v-if="isFshow">
<view class="site-box flex_a_c_j_sb" :style="{'background-color':backColor}">
<view :class="['place_wrapper','flex_a_c',isFshow?'sitebox':'']" @click="selectLocation">
<view :class="['iconfont','icon-weizhi',isFshow?'sitebox':'']"
style="color:#000;margin-left: 20rpx;">
<view
class="site-box flex_a_c_j_sb"
:style="{ 'background-color': backColor }"
>
<view
:class="['place_wrapper', 'flex_a_c', isFshow ? 'sitebox' : '']"
@click="selectLocation"
>
<view
:class="['iconfont', 'icon-weizhi', isFshow ? 'sitebox' : '']"
style="color: #000; margin-left: 20rpx"
>
</view>
<view class="town_name" style="color:#000;">{{street}}</view>
<view class="town_name" style="color: #000">{{ street }}</view>
</view>
<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
<view :class="['iconfont','icon-xiaoxi',isFshow?'sitebox':'']" style="color:#000;"></view>
<navigator
url="/pages/chat/customer_list/index?type=0"
hover-class="none"
>
<view
:class="['iconfont', 'icon-xiaoxi', isFshow ? 'sitebox' : '']"
style="color: #000"
></view>
</navigator>
</view>
<!-- <view class="site-box ','flex_a_c_j_sb'" v-if="ishshow">
@ -19,33 +32,52 @@
<img :src="bgColor" alt="">
</view>
</view> -->
</view>
<zbpSwiper ref='list' :isSelectPlace="true" :town='street' :show='show' :location_Arr="locationArr"
@kkchange='kkchange' @change='dchange'>
<zbpSwiper
ref="list"
:isSelectPlace="true"
:town="street"
:show="show"
:location_Arr="locationArr"
@kkchange="kkchange"
@change="dchange"
>
</zbpSwiper>
<view class="tabs_wrapper">
<u-tabs :list="tabsData.list" @click="tabsChange" lineColor="#F84221" keyName="cate_name"
:activeStyle="activeStyle" itemStyle="padding-left: 0px; height: 33px;"></u-tabs>
</view>
<view class="">
<u-tabs
:list="tabsData.list"
@click="tabsChange"
lineColor="#F84221"
keyName="cate_name"
:activeStyle="activeStyle"
itemStyle="padding-left: 0px; height: 33px;"
></u-tabs>
</view>
<view class=""> </view>
<view class="goodslist">
<WaterfallsFlow :wfList='cateGoods' />
<WaterfallsFlow :wfList="cateGoods" />
</view>
<view class="empty_wrapper" v-if="emptyShow">
<u-empty :show="emptyShow" mode="list" icon="http://cdn.uviewui.com/uview/empty/list.png"></u-empty>
<u-empty
:show="emptyShow"
mode="list"
icon="http://cdn.uviewui.com/uview/empty/list.png"
></u-empty>
</view>
</view>
<u-picker :defaultIndex="[0,0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
@cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
<u-picker
:defaultIndex="[0, 0]"
:show="showPicker"
ref="uPicker"
:columns="columnData"
@confirm="confirm"
@cancel="showPicker = false"
@change="changeHandler"
keyName="name"
></u-picker>
<u-loadmore :status="status" v-if="cateGoods.length >= where.limit" />
<!-- <view class="bg_color"></view> -->
@ -56,13 +88,9 @@
</view>
</template>
</m-tabbar> -->
<view class="location" v-if='isshow'>
<view class="locationa">
位置权限使用说明
</view>
<view class="locationb">
用于向你推荐最近门店
</view>
<view class="location" v-if="isshow">
<view class="locationa"> 位置权限使用说明 </view>
<view class="locationb"> 用于向你推荐最近门店 </view>
</view>
</view>
</template>
@ -206,6 +234,28 @@
// 监听页面滚动事件
window.addEventListener("scroll", this.scrolling);
// #endif
},
onTabItemTap (e) {
if (e.text.length >= 4) {
uni.pageScrollTo({
selector: ".Circle_friends",
scrollTop: 0
})
}
},
onReachBottom () {
if (this.status == 'nomore') return;
this.status = 'loading';
this.where.page = ++this.where.page;
this.getGoods()
},
mounted () {
this.selfLocation()
// #ifdef H5
// 监听页面滚动事件
window.addEventListener("scroll", this.scrolling);
// #endif
this.$bus.$on('value-updated', (newValue) => {
// 更新父组件的值
@ -623,13 +673,13 @@
<style lang="scss" scoped>
page {
background-color: #F4F7FE;
background-color: #f4f7fe;
// background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%);
}
.location {
background-color: #F6F6F6;
background-color: #f6f6f6;
width: 680rpx;
height: 150rpx;
position: absolute;
@ -659,11 +709,9 @@
position: relative;
padding: 0 0 87.72rpx 0;
background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%);
background: linear-gradient(180deg, #ffffff 0%, #f6f6f6 100%);
}
// .bg-img {
// position: absolute;
// width: 100%;
@ -680,7 +728,6 @@
// filter: blur(0);
// overflow: hidden;
// img {
// width: 100%;
// height: 100%;
@ -689,7 +736,6 @@
// }
// }
.sitebox {
animation-name: fadeIn;
animation-duration: 3s;
@ -706,7 +752,6 @@
}
}
.site-box {
width: 100%;
/* #ifdef MP || APP-PLUS */
@ -750,8 +795,6 @@
}
}
.circle_friends_wrapper {
position: relative;
@ -761,8 +804,6 @@
/deep/.u-tabs__wrapper__nav__line {
width: 46rpx;
margin-left: -2rpx;
}
/deep/.u-tabs__wrapper__nav__item {
@ -780,7 +821,6 @@
margin: 0 auto;
margin-bottom: 21.05rpx;
// margin-left: -20rpx;
}
.empty_wrapper {
@ -852,11 +892,11 @@
font-weight: bold;
&::before {
content: '';
content: "";
display: inline-block;
width: 3px;
height: 31.58rpx;
background-color: #F84221;
background-color: #f84221;
margin-right: 7.02rpx;
}
}
@ -965,7 +1005,7 @@
align-items: center;
.isshow {
color: #FE3530 !important;
color: #fe3530 !important;
}
.iconfont {
@ -973,7 +1013,7 @@
}
.icon-shoucang1 {
color: #F84221;
color: #f84221;
}
.collect {
@ -985,11 +1025,9 @@
}
}
.goods_items {
width: 356rpx;
border-radius: 8px;
overflow: hidden;
background-color: #fff;
@ -1070,7 +1108,7 @@
align-items: center;
.isshow {
color: #FE3530 !important;
color: #fe3530 !important;
}
.iconfont {
@ -1078,7 +1116,7 @@
}
.icon-shoucang1 {
color: #F84221;
color: #f84221;
}
.collect {
@ -1089,6 +1127,5 @@
}
}
}
}
</style>

6
pages/nongKe/supply_chain/supplierA.vue
View File

@ -1,5 +1,9 @@
<template>
<view style="background-color: #F0F2F5;min-height: 100vh">
<view class="">
<view style="height: var(--status-bar-height);"></view>
<view class='productList' :style="viewColor">
<!-- 顶部 -->
@ -262,6 +266,8 @@
</view>
</view>
</view>
</template>
<script>

8
pages/product/basicSet.vue
View File

@ -132,7 +132,8 @@
<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>客服电话：</view>
<input class="com_input" type="number" v-model="servicePhone" placeholder="输入客服电话">
</view>
<view class="item_cell flex_a_c">
<view class="item_cell flex_a_c" v-if="type_code!='TypeFamousSpecialties'||type_code!='TypeLocalCuisine'||type_code!='TypeFeaturedCultural'" >
<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao" v-if="credit_buy"></i>开启先货后款：</view>
<u-switch v-model="credit_buy" @change="change"></u-switch>
</view>
@ -154,6 +155,7 @@
<text style="color: #CCCCCC;">开启后，店铺即可展示在移动端</text>
</view> -->
</view>
<button class="submit_btn l_center" @click="postMerchantUpdata">提交审核</button>
@ -265,7 +267,8 @@
credit_buy: false, //开启信用购
interest_rate: '', //利率
settle_cycle: '', //周期
mer_name:''
mer_name:'',
type_code:''
}
},
onLoad(e) {
@ -295,6 +298,7 @@
res.data.mer_take_day.forEach((item, i) => {
this.dateWeek[Number(item) - 1].isCheck = true
})
this.type_code= res.data.type_code
this.mer_take_time = res.data.mer_take_time
this.intro = res.data.mer_info
this.cruxText = res.data.mer_keyword

4
pages/short_video/appSwiper/index.nvue
View File

@ -319,8 +319,7 @@
<view class="fixed-head">
<view class="sys-head" :style="{height:statusBarHeight}"></view>
<view class="tool-bar" @click='goBack()'>
<image class="icon-xiangzuo" src="@/static/image/icon-back.png"></image>
<image class="icon-xiangzuo" src="../static/img/index/icon-back.png"></image>
</view>
</view>
</view>
@ -1240,6 +1239,7 @@
top: 70rpx;
height: 86rpx;
.icon-xiangzuo {
margin-left: 10px;
width: 20px;

BIN
pages/short_video/components/index/icon-back.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 421 B

3
pages/short_video/nvueSwiper/index.nvue
View File

@ -775,8 +775,7 @@
page: that.page,
limit: that.limit,
id: this.videoID
// is_star: that.isSatrt,
// community_id: that.videoID
}).then(res => {
that.videoData(res.data.list)
if (res.data.list.length < that.limit) {

9
pages/supply_chains/supply_chains.vue
View File

@ -88,7 +88,7 @@
</view>
<view class="list-con-right">
<view class="con-right" style="margin-bottom: 20rpx"
@tap="navgo('/pages/nongKe/food/index?type_code=TypeLocalCuisine')">
@click="navgo('/pages/nongKe/food/index?type_code=TypeLocalCuisine')">
<!-- <view class="list-con-title">
<view class="con-titlea">
当地美食
@ -99,7 +99,8 @@
</view> -->
<image src="@/static/images/f7.png" mode="aspectFit"></image>
</view>
<view class="con-right" @tap="navgo('/pages/nongKe/tourism/index?type_code=TypeFeaturedCultural')">
<view class="con-right"
@click="navgo('/pages/nongKe/tourism/index?type_code=TypeFeaturedCultural')">
<!-- <view class="list-con-title">
<view class="con-titlea">
特色文旅
@ -255,6 +256,10 @@
this.list()
},
beforeDestroy() {
// 销毁监听事件
this.$bus.$off('value-updated')
},
mounted() {
// #ifdef H5

BIN
static/applet/GX_APP.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.3 KiB

BIN
static/applet/SHOP_APP.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.1 KiB

BIN
static/images/icon-back.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 884 B

BIN
static/tabbar_icon/top.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.9 KiB