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:
jia 2023-09-13 18:09:06 +08:00
parent 88be55571a
commit 19f4211a64
12 changed files with 217 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
App.vue
View File

@ -149,7 +149,7 @@
that.getConfigData() that.getConfigData()
//#ifdef APP-PLUS //#ifdef APP-PLUS
this.checknetwork()
jpushModule.setLoggerEnable(true); jpushModule.setLoggerEnable(true);
jpushModule.initJPushService() jpushModule.initJPushService()

20
components/zbpSwiper.vue
View File

@ -7,13 +7,13 @@
<view class="site-box flex_a_c_j_sb"> <view class="site-box flex_a_c_j_sb">
<view class="place_wrapper flex_a_c" @click="selectLocation"> <!-- <view class="place_wrapper flex_a_c" @click="selectLocation">
<view class="iconfont icon-weizhi"></view> <view class="iconfont icon-weizhi"></view>
<view class="town_name">{{street}}</view> <view class="town_name">{{street}}</view>
</view> </view>
<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none"> <navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
<view class="iconfont icon-xiaoxi" style="color:#fff;"></view> <view class="iconfont icon-xiaoxi" style="color:#fff;"></view>
</navigator> </navigator> -->
</view> </view>
<!-- 搜索栏 --> <!-- 搜索栏 -->
<navigator url="/pages/columnGoods/goods_search/index" hover-class="none" class="search_content flex_a_c_j_sb"> <navigator url="/pages/columnGoods/goods_search/index" hover-class="none" class="search_content flex_a_c_j_sb">
@ -51,9 +51,7 @@
getIndexData, getIndexData,
getDiy getDiy
} from '@/api/api.js' } from '@/api/api.js'
import {
getGeocoder
} from '@/api/store.js';
import { import {
mapGetters mapGetters
} from 'vuex' } from 'vuex'
@ -115,11 +113,17 @@
}, },
mounted() { mounted() {
this.$bus.$on('value-updated', (newValue) => { this.$bus.$on('value-updated', (newValue) => {
// 更新组件的值 // 更新组件的值
this.street = newValue.split(',')[0] this.street = newValue.split(',')[0]
}); });
}, },
onShow() {
this.getBanner()
this.Area()
},
methods: { methods: {
swiperClick(item) { swiperClick(item) {
@ -130,11 +134,9 @@
}, },
selectLocation() { selectLocation() {
this.isSelectPlace ? this.showPicker = true : '' this.isSelectPlace ? this.showPicker = true : ''
}, },
confirm(e) { confirm(e) {
this.showPicker = false this.showPicker = false
this.$emit('selectPlce', e) this.$emit('selectPlce', e)
this.$emit('change', e) this.$emit('change', e)
@ -144,8 +146,6 @@
}) })
}, },
changeHandler(e) { changeHandler(e) {
const { const {
@ -266,7 +266,7 @@
height: 66.67rpx; height: 66.67rpx;
margin-bottom: 26.32rpx; margin-bottom: 26.32rpx;
position: relative; position: relative;
z-index: 9999; z-index: 0;
// 位置 // 位置

4
config/app.js
View File

@ -9,8 +9,8 @@ let httpApiThree
// 网络接口修改此字符 小程序域名要求https // 网络接口修改此字符 小程序域名要求https
// let httpApi = 'http://192.168.31.110:8324' // 测试 // let httpApi = 'http://192.168.31.110:8324' // 测试
if (process.env.NODE_ENV === "development") { if (process.env.NODE_ENV === "development") {
// httpApi = 'https://shop.lihaink.cn' // 生产 httpApi = 'https://shop.lihaink.cn' // 生产
httpApi = "https://crmeb-test.shop.lihaink.cn" // httpApi = "https://crmeb-test.shop.lihaink.cn"
// httpApi = "http://192.168.0.222" // httpApi = "http://192.168.0.222"
// httpApi = "http://192.168.0.108:8325" // httpApi = "http://192.168.0.108:8325"
// httpApi = 'http://192.168.0.108:8325' // httpApi = 'http://192.168.0.108:8325'

64
pages/gather/gather.vue
View File

@ -1,12 +1,11 @@
<template> <template>
<view class="gather"> <view class="gather">
<view @click="selectLocation" v-if="isFshow">
<view v-if="isFshow"> <view v-if="isFshow">
<view class="site-box flex_a_c_j_sb" :style="{ 'opacity': backColor,}"> <view class="site-box flex_a_c_j_sb" :style="{ 'opacity': backColor,}" @click="selectLocation">
<view :class="['place_wrapper', 'flex_a_c', isFshow ? 'sitebox' : '']" @click="selectLocation"> <view :class="['place_wrapper', 'flex_a_c', isFshow ? 'sitebox' : '']" @click="selectLocation">
<view :class="['iconfont', 'icon-weizhi', isFshow ? 'sitebox' : '']" <view :class="['iconfont', 'icon-weizhi', isFshow ? 'sitebox' : '']" style=" margin-left: 20rpx">
style=" margin-left: 20rpx">
</view> </view>
<view class="town_name">{{ street }}</view> <view class="town_name">{{ street }}</view>
</view> </view>
@ -14,19 +13,22 @@
<view :class="['iconfont', 'icon-xiaoxi', isFshow ? 'sitebox' : '']"></view> <view :class="['iconfont', 'icon-xiaoxi', isFshow ? 'sitebox' : '']"></view>
</navigator> </navigator>
</view> </view>
<!--<view class="site-box ','flex_a_c_j_sb'" v-if="ishshow">
<view class="bg-img">
<img :src="bgColor" alt="">
</view>
</view> -->
</view>
<!-- <view class="site-box ','flex_a_c_j_sb'" v-if="ishshow">
<view class="bg-img">
<img :src="bgColor" alt="">
</view>
</view> -->
</view> </view>
<view class="" v-if="!isFshow">
<view class="site-box1 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>
</view>
<zbpSwiper :isSelectPlace="true" :location_Arr="locationArr" :town="street" @kkchange="kkchange"></zbpSwiper> <zbpSwiper :isSelectPlace="true" :location_Arr="locationArr" :town="street" @kkchange="kkchange"></zbpSwiper>
<u-empty :show="jurisdiction" mode="permission" :text="emptyText" <u-empty :show="jurisdiction" mode="permission" :text="emptyText"
@ -311,7 +313,7 @@
}, },
// 编辑完成 // 编辑完成
editComfirm() { editComfirm() {
this.editFlag = false; this.editFlag = false;
uni.setStorageSync('gatherNowMenuList', JSON.stringify(this.nowMenuList)); uni.setStorageSync('gatherNowMenuList', JSON.stringify(this.nowMenuList));
}, },
getUniMp(appid) { getUniMp(appid) {
@ -462,7 +464,37 @@ this.editFlag = false;
opacity: 1; opacity: 1;
} }
} }
.site-box1 {
width: 706rpx;
/* #ifdef MP || APP-PLUS */
height: 160rpx;
/* #endif */
/* #ifdef H5 */
height: 120rpx;
/* #endif */
margin-bottom: 26.32rpx;
position: absolute;
top: 45rpx;
left: 20rpx;
z-index: 999;
// 位置
.place_wrapper {
color: #fff;
margin-right: 0rpx;
font-size: 30rpx;
.town_name {
margin-left: 21rpx;
}
}
.iconfont {
font-size: 35.09rpx;
}
}
.site-box { .site-box {
width: 100%; width: 100%;
/* #ifdef MP || APP-PLUS */ /* #ifdef MP || APP-PLUS */

91
pages/index/index.vue
View File

@ -19,6 +19,18 @@
</view> </view>
</view> --> </view> -->
</view> </view>
<view class="" v-if="!isFshow">
<view class="site-box1 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>
</view>
<zbpSwiper ref="list" :isSelectPlace="true" :town="street" :show="show" :location_Arr="locationArr" <zbpSwiper ref="list" :isSelectPlace="true" :town="street" :show="show" :location_Arr="locationArr"
@ -186,37 +198,9 @@
scrollTop: 0, scrollTop: 0,
show: true, show: true,
userid: '', userid: '',
current:0 current: 0
} }
}, },
onShow() {
//监听网络状态变化
uni.onNetworkStatusChange((res) => {
//当前是否有网络连接 返回true或者false
if (res.isConnected) {
this.getCateList()
this.getGoods()
this.Area()
uni.$on('connectstatusChange', (connectstatus) => {
var connectstr = ''
if (connectstatus == true) {
connectstr = '已连接'
this.getRegistrationID()
} else {
connectstr = '未连接'
}
this.connectstatus = connectStr
})
}
});
},
onPullDownRefresh() { onPullDownRefresh() {
this.getCateList() this.getCateList()
@ -246,12 +230,7 @@
}, },
onHide() { onHide() {
this.getGoods(true)
uni.pageScrollTo({
selector: ".Circle_friends",
scrollTop: 0
})
uni.setTabBarItem({ uni.setTabBarItem({
index: 0, index: 0,
text: "泸州", text: "泸州",
@ -263,19 +242,20 @@
}, },
onReachBottom() { onReachBottom() {
if (this.productList.length > 0) { if (this.productList.length > 0) {
setTimeout(() => { setTimeout(() => {
this.getGoods(false); this.getGoods(false);
}, 1000) }, 1000)
} else {
this.get_host_product();
} }
}, },
mounted() { mounted() {
this.getUserInfo() this.getUserInfo()
uni.onNetworkStatusChange((res) => {
console.log(res, res.networkType)
});
this.selfLocation() this.selfLocation()
// #ifdef H5 // #ifdef H5
// 监听页面滚动事件 // 监听页面滚动事件
@ -431,8 +411,6 @@
}, },
tabsChange1(item) { tabsChange1(item) {
this.getArticleList(item.article_category_id) this.getArticleList(item.article_category_id)
@ -615,7 +593,7 @@
this.current = item.index this.current = item.index
}, },
tabsChange2(item,index) { tabsChange2(item, index) {
// console.log(item,index) // console.log(item,index)
this.productList = [] this.productList = []
@ -641,6 +619,7 @@
type: 'wgs84', type: 'wgs84',
timeout: '1000', timeout: '1000',
success: (res) => { success: (res) => {
this.isshow = false this.isshow = false
let latitude, longitude; let latitude, longitude;
latitude = res.latitude.toString(); latitude = res.latitude.toString();
@ -895,6 +874,38 @@
} }
} }
.site-box1 {
width: 706rpx;
/* #ifdef MP || APP-PLUS */
height: 160rpx;
/* #endif */
/* #ifdef H5 */
height: 120rpx;
/* #endif */
margin-bottom: 26.32rpx;
position: absolute;
top: 45rpx;
left: 20rpx;
z-index: 999;
// 位置
.place_wrapper {
color: #fff;
margin-right: 0rpx;
font-size: 30rpx;
.town_name {
margin-left: 21rpx;
}
}
.iconfont {
font-size: 35.09rpx;
}
}
.site-box { .site-box {
width: 100%; width: 100%;
/* #ifdef MP || APP-PLUS */ /* #ifdef MP || APP-PLUS */

6
pages/plantGrass/plant_detail/index.vue
View File

@ -735,7 +735,7 @@
height: 51rpx; height: 51rpx;
margin-right: 20rpx; margin-right: 20rpx;
margin-top: 20rpx; margin-top: 10rpx;
image { image {
width: 100%; width: 100%;
@ -921,8 +921,8 @@
.picture, .picture,
uni-image { uni-image {
width: 78rpx; width: 70rpx;
height: 78rpx; height: 70rpx;
border-radius: 100%; border-radius: 100%;
} }

5
pages/product/basicSet.vue
View File

@ -137,7 +137,8 @@
<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao" v-if="credit_buy"></i>开启先货后款：</view> <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> <u-switch v-model="credit_buy" @change="change"></u-switch>
</view> --> </view> -->
<view class="item_cell flex_a_c" v-if="credit_buy">
<!-- <view class="item_cell flex_a_c" v-if="credit_buy">
<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>先货后款结算周期：</view> <view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>先货后款结算周期：</view>
<input type="number" v-model="settle_cycle" placeholder="请输入 /周期单位为:天"> <input type="number" v-model="settle_cycle" placeholder="请输入 /周期单位为:天">
</view> </view>
@ -145,7 +146,7 @@
<view class="item_cell flex_a_c" v-if="credit_buy"> <view class="item_cell flex_a_c" v-if="credit_buy">
<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>先货后款结算利率：</view> <view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>先货后款结算利率：</view>
<input type="number" maxlength="5" v-model="interest_rate" placeholder="请输入 /利率单位为: %"> <input type="number" maxlength="5" v-model="interest_rate" placeholder="请输入 /利率单位为: %">
</view> </view> -->
<!-- <view class="remarks">*利率结算范围为:0.01 ~ 0.1 利率单位为:%</view> --> <!-- <view class="remarks">*利率结算范围为:0.01 ~ 0.1 利率单位为:%</view> -->
<!-- <view class="item_cell"> <!-- <view class="item_cell">
<view class="if_btn flex_a_c_j_sb"> <view class="if_btn flex_a_c_j_sb">

3
pages/product/list/index.vue
View File

@ -113,7 +113,7 @@
</view> </view>
<view class="muau-header" v-if='index==num' <view class="muau-header" v-if='index==num'
style="position: absolute; top: 40rpx; right: 0px;"> style="position: absolute; top: 60rpx; right: 0px;">
<view class="muau" v-for='(kk,i) in options' <view class="muau" v-for='(kk,i) in options'
@click='menuAction(kk, item.attrValue,item,index)'> @click='menuAction(kk, item.attrValue,item,index)'>
<view class=""> <view class="">
@ -169,6 +169,7 @@
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
<view class="shuru" v-if="this.on_line == 1"> <view class="shuru" v-if="this.on_line == 1">
数量: <input type="number" v-model="data.number" placeholder="请输入"> 数量: <input type="number" v-model="data.number" placeholder="请输入">
</view> </view>

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

@ -149,7 +149,7 @@
<view class="picture"> <view class="picture">
<image class="image" :src="goods.spu.image"></image> <image class="image" :src="goods.spu.image"></image>
</view> </view>
<view class="product-text" > <view class="product-text">
<text class="name line1" <text class="name line1"
v-if="goods.spu && goods.spu.store_name.length>=12">{{goods.spu.store_name.slice(0,12)}}...</text> v-if="goods.spu && goods.spu.store_name.length>=12">{{goods.spu.store_name.slice(0,12)}}...</text>
<text class="name line1" <text class="name line1"
@ -226,7 +226,7 @@
<text class="count">{{item.relevance.length}}</text> <text class="count">{{item.relevance.length}}</text>
</view> </view>
</view> </view>
<view v-if="showManage == item.author.uid" class="manage"> <view v-if="showManage == item.author.uid || showManage " class="manage" :style="{'margin-top':item.relevance.length>0?'-115rpx':'0px'}">
<view class="manage-gou"></view> <view class="manage-gou"></view>
<navigator hover-class="none" <navigator hover-class="none"
:url="'/pages/plantGrass/plant_release/index?id='+item.community_id+'&type=2'" :url="'/pages/plantGrass/plant_release/index?id='+item.community_id+'&type=2'"
@ -309,15 +309,15 @@
</view> </view>
</uni-popup> </uni-popup>
<!-- 他提到的宝贝弹窗 --> <!-- 他提到的宝贝弹窗 -->
<uni-popup type="bottom" ref="pinglunMentioned"> <uni-popup type="bottom" ref="pinglunMentioned" style="background-color: rebeccapurple;">
<view
:style="'width: '+ windowWidth +'px;background-color: #F5F5F5; border-top-left-radius: 10px; border-top-right-radius: 10px;'">
<mentioned ref="mentioned" @close="closePopup" :list="moreList" :uid="authorUid"></mentioned> <mentioned ref="mentioned" @close="closePopup" :list="moreList" :uid="authorUid" ></mentioned>
</view>
</uni-popup> </uni-popup>
<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
<view class="fixed-head"> <view class="fixed-head">
<view class="sys-head" :style="{height:statusBarHeight}"></view> <!-- <view class="sys-head" :style="{height:statusBarHeight}"></view> -->
<view class="tool-bar" @click='goBack()'> <view class="tool-bar" @click='goBack()'>
<image class="icon-xiangzuo" src="../static/img/index/icon-back.png"></image> <image class="icon-xiangzuo" src="../static/img/index/icon-back.png"></image>
</view> </view>
@ -358,7 +358,9 @@
import { import {
getUserInfo getUserInfo
} from '@/api/user.js'; } from '@/api/user.js';
import { navigateBack } from '../../../libs/uniApi'; import {
navigateBack
} from '../../../libs/uniApi';
export default { export default {
computed: configMap({ computed: configMap({
statusBarHeight: 0, statusBarHeight: 0,
@ -638,22 +640,19 @@ import { navigateBack } from '../../../libs/uniApi';
content: '确定要删除该话题么？', content: '确定要删除该话题么？',
success: function(res) { success: function(res) {
if (res.confirm) { if (res.confirm) {
console.log(item.community_id)
deletePlantApi(item.community_id).then(res => { deletePlantApi(item.community_id).then(res => {
console.log(res)
if (res.status == 200) { if (res.status == 200) {
uni.navigateBack({
delta: 1,
})
that.$util.Tips({ that.$util.Tips({
title: res.message title: res.message
}); });
// setTimeout(function() {
// uni.redirectTo({
// url: '/pages/plantGrass/plant_user/index?id=' +
// item.uid
// })
// }, 1000);
uni.navigateBack({
delta:1,
})
} }
}) })
@ -1105,6 +1104,7 @@ import { navigateBack } from '../../../libs/uniApi';
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
// .video-list{ // .video-list{
// padding: 200rpx 28.07rpx 0 28.07rpx; // padding: 200rpx 28.07rpx 0 28.07rpx;
// display: flex; // display: flex;
@ -1124,6 +1124,7 @@ import { navigateBack } from '../../../libs/uniApi';
/* #ifdef MP */ /* #ifdef MP */
padding-top: 200rpx; padding-top: 200rpx;
/* #endif */ /* #endif */
// background-color: #000000; // background-color: #000000;
background-color: #F5F5F5; background-color: #F5F5F5;
@ -1246,10 +1247,12 @@ import { navigateBack } from '../../../libs/uniApi';
left: 0; left: 0;
top: 70rpx; top: 70rpx;
height: 86rpx; height: 86rpx;
background-color: yellow;
.icon-xiangzuo { .icon-xiangzuo {
margin-left: 10px; margin-left: 10px;
width: 20px; width: 20px;
height: 20px; height: 20px;
@ -1309,7 +1312,7 @@ import { navigateBack } from '../../../libs/uniApi';
width: 690rpx; width: 690rpx;
position: absolute; position: absolute;
left: 30rpx; left: 30rpx;
background: #000; // background: #000;
border-radius: 10rpx; border-radius: 10rpx;
top: 150rpx; top: 150rpx;
padding: 30rpx; padding: 30rpx;
@ -1724,7 +1727,7 @@ import { navigateBack } from '../../../libs/uniApi';
} }
.root { .root {
background-color: #000000; // background-color: #000000;
} }
</style> </style>

9
pages/short_video/components/mentioned/mentioned.vue
View File

@ -96,11 +96,12 @@
width: 750rpx; width: 750rpx;
background-color: #ffffff; background-color: #ffffff;
border-radius: 16rpx 16rpx 0 0; border-radius: 16rpx 16rpx 0 0;
.header{ .header{
position: relative; position: relative;
padding: 40rpx 30rpx; padding: 40rpx 30rpx;
.title{ .title{
color: #282828; // color: #282828;
font-size: 30rpx; font-size: 30rpx;
} }
.closeBnt{ .closeBnt{
@ -158,12 +159,12 @@
align-items: flex-end; align-items: flex-end;
.sm{ .sm{
font-weight: bold; font-weight: bold;
color: #E93323; color: #FF6D20;
font-size: 26rpx; font-size: 26rpx;
} }
.text{ .text{
font-weight: bold; font-weight: bold;
color: #E93323; color: #FF6D20;
font-size: 34rpx; font-size: 34rpx;
} }
} }
@ -175,7 +176,7 @@
justify-content: center; justify-content: center;
font-size: 24rpx; font-size: 24rpx;
color: #fff; color: #fff;
background: #E93323; background: #FF6D20;
} }
} }
} }

45
pages/supply_chains/supply_chains.vue
View File

@ -17,6 +17,18 @@
</view> </view>
<view class="" v-if="!isFshow">
<view class="site-box1 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>
</view>
<zbpSwiper :isSelectPlace="true" :town="street" :streetname="street" :location_Arr="locationArr" <zbpSwiper :isSelectPlace="true" :town="street" :streetname="street" :location_Arr="locationArr"
@change="dchange"> @change="dchange">
@ -574,6 +586,39 @@
// background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%); // background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%);
} }
.site-box1 {
width: 706rpx;
/* #ifdef MP || APP-PLUS */
height: 160rpx;
/* #endif */
/* #ifdef H5 */
height: 120rpx;
/* #endif */
margin-bottom: 26.32rpx;
position: absolute;
top: 45rpx;
left: 20rpx;
z-index: 9999 !important;
// 位置
.place_wrapper {
color: #fff;
margin-right: 0rpx;
font-size: 30rpx;
.town_name {
margin-left: 21rpx;
}
}
.iconfont {
font-size: 35.09rpx;
}
}
.location { .location {
background-color: #f6f6f6; background-color: #f6f6f6;
width: 680rpx; width: 680rpx;

6
pages/users/login/login_copy.vue
View File

@ -2,9 +2,9 @@
<div :style="viewColor"> <div :style="viewColor">
<div class="register absolute" v-if="!auth_token"> <div class="register absolute" v-if="!auth_token">
<div class="login"> <div class="login">
<div class="shading"> <div class="shading" >
<div class="pictrue acea-row row-center-wrapper"> <div class="pictrue acea-row row-center-wrapper" style="background-color: transparent !important;">
<image :src="login_logo" v-if="login_logo" /> <image src="@/static/images/logo1.png" />
</div> </div>
</div> </div>
<div class="whiteBg" v-if="formItem === 1"> <div class="whiteBg" v-if="formItem === 1">