diff --git a/App.vue b/App.vue
index 951f3f5..387107c 100644
--- a/App.vue
+++ b/App.vue
@@ -149,7 +149,7 @@
that.getConfigData()
//#ifdef APP-PLUS
-
+ this.checknetwork()
jpushModule.setLoggerEnable(true);
jpushModule.initJPushService()
@@ -258,7 +258,7 @@
uni.reLaunch({
url: '/pages/index/index'
})
-
+
} else {
uni.showModal({
diff --git a/components/zbpSwiper.vue b/components/zbpSwiper.vue
index dc15f5e..8dea21b 100644
--- a/components/zbpSwiper.vue
+++ b/components/zbpSwiper.vue
@@ -7,13 +7,13 @@
<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="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>
+ </navigator> -->
</view>
<!-- 搜索栏 -->
<navigator url="/pages/columnGoods/goods_search/index" hover-class="none" class="search_content flex_a_c_j_sb">
@@ -51,9 +51,7 @@
getIndexData,
getDiy
} from '@/api/api.js'
- import {
- getGeocoder
- } from '@/api/store.js';
+
import {
mapGetters
} from 'vuex'
@@ -115,11 +113,17 @@
},
mounted() {
+
this.$bus.$on('value-updated', (newValue) => {
// 更新组件的值
this.street = newValue.split(',')[0]
+
});
},
+ onShow() {
+ this.getBanner()
+ this.Area()
+ },
methods: {
swiperClick(item) {
@@ -130,11 +134,9 @@
},
selectLocation() {
this.isSelectPlace ? this.showPicker = true : ''
-
},
confirm(e) {
-
this.showPicker = false
this.$emit('selectPlce', e)
this.$emit('change', e)
@@ -144,8 +146,6 @@
})
-
-
},
changeHandler(e) {
const {
@@ -266,7 +266,7 @@
height: 66.67rpx;
margin-bottom: 26.32rpx;
position: relative;
- z-index: 9999;
+ z-index: 0;
// 位置
diff --git a/config/app.js b/config/app.js
index 8036f9b..63b75ab 100644
--- a/config/app.js
+++ b/config/app.js
@@ -9,8 +9,8 @@ let httpApiThree
// 网络接口修改此字符 小程序域名要求https
// let httpApi = 'http://192.168.31.110:8324' // 测试
if (process.env.NODE_ENV === "development") {
- // httpApi = 'https://shop.lihaink.cn' // 生产
-httpApi = "https://crmeb-test.shop.lihaink.cn"
+ httpApi = 'https://shop.lihaink.cn' // 生产
+ // httpApi = "https://crmeb-test.shop.lihaink.cn"
// httpApi = "http://192.168.0.222"
// httpApi = "http://192.168.0.108:8325"
// httpApi = 'http://192.168.0.108:8325'
diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index e600f37..f5c2e4d 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -1,32 +1,34 @@
<template>
<view class="gather">
- <view @click="selectLocation" v-if="isFshow">
- <view v-if="isFshow">
- <view class="site-box flex_a_c_j_sb" :style="{ 'opacity': backColor,}">
- <view :class="['place_wrapper', 'flex_a_c', isFshow ? 'sitebox' : '']" @click="selectLocation">
- <view :class="['iconfont', 'icon-weizhi', isFshow ? 'sitebox' : '']"
- style=" margin-left: 20rpx">
- </view>
- <view class="town_name">{{ street }}</view>
+
+ <view v-if="isFshow">
+ <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="['iconfont', 'icon-weizhi', isFshow ? 'sitebox' : '']" style=" margin-left: 20rpx">
</view>
- <navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
- <view :class="['iconfont', 'icon-xiaoxi', isFshow ? 'sitebox' : '']"></view>
- </navigator>
+ <view class="town_name">{{ street }}</view>
</view>
- <!--<view class="site-box ','flex_a_c_j_sb'" v-if="ishshow">
- <view class="bg-img">
- <img :src="bgColor" alt="">
- </view>
- </view> -->
+ <navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
+ <view :class="['iconfont', 'icon-xiaoxi', isFshow ? 'sitebox' : '']"></view>
+ </navigator>
</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="" 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>
<u-empty :show="jurisdiction" mode="permission" :text="emptyText"
@@ -311,7 +313,7 @@
},
// 编辑完成
editComfirm() {
-this.editFlag = false;
+ this.editFlag = false;
uni.setStorageSync('gatherNowMenuList', JSON.stringify(this.nowMenuList));
},
getUniMp(appid) {
@@ -402,7 +404,7 @@ this.editFlag = false;
},
fail: (err) => {
this.isshow = false
-
+
}
});
},
@@ -462,7 +464,37 @@ this.editFlag = false;
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 {
width: 100%;
/* #ifdef MP || APP-PLUS */
@@ -482,7 +514,7 @@ this.editFlag = false;
/* #ifdef H5 */
padding-top: 25rpx;
/* #endif */
- // background-color: #e5e5e5;
+ // background-color: #e5e5e5;
background: url('@/static/images/bg2.png') no-repeat;
background-size: 100% 100%;
padding-right: 20rpx;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 89b9260..1218e55 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -19,6 +19,18 @@
</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"
@@ -36,7 +48,7 @@
<view class="" style="width: 670rpx;">
<u-tabs :list="tabsData.list" @click="tabsChange" itemStyle=" height: 33px;" lineColor="#F84221"
- :current="current" keyName="cate_name" :activeStyle="activeStyle"></u-tabs>
+ :current="current" keyName="cate_name" :activeStyle="activeStyle"></u-tabs>
</view>
<view class="tabs_wrapper-img" @click="open">
<image src="@/static/images/zk.png" mode=""></image>
@@ -186,37 +198,9 @@
scrollTop: 0,
show: true,
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() {
this.getCateList()
@@ -246,12 +230,7 @@
},
onHide() {
- this.getGoods(true)
-
- uni.pageScrollTo({
- selector: ".Circle_friends",
- scrollTop: 0
- })
+
uni.setTabBarItem({
index: 0,
text: "泸州",
@@ -263,19 +242,20 @@
},
onReachBottom() {
-
if (this.productList.length > 0) {
setTimeout(() => {
this.getGoods(false);
}, 1000)
- } else {
- this.get_host_product();
}
},
mounted() {
this.getUserInfo()
+
+ uni.onNetworkStatusChange((res) => {
+ console.log(res, res.networkType)
+ });
this.selfLocation()
// #ifdef H5
// 监听页面滚动事件
@@ -431,8 +411,6 @@
},
-
-
tabsChange1(item) {
this.getArticleList(item.article_category_id)
@@ -603,7 +581,7 @@
}, ...data]
},
tabsChange(item) {
-
+
this.productList = []
this.where.category_id = item.category_id
this.emptyShow = false
@@ -615,9 +593,9 @@
this.current = item.index
},
- tabsChange2(item,index) {
- // console.log(item,index)
-
+ tabsChange2(item, index) {
+ // console.log(item,index)
+
this.productList = []
this.where.category_id = item.category_id
this.$refs.popup.close()
@@ -627,7 +605,7 @@
this.getGoods(true)
this.tabsData.tabsActive = index
this.current = index
-
+
},
selfLocation() {
@@ -641,6 +619,7 @@
type: 'wgs84',
timeout: '1000',
success: (res) => {
+
this.isshow = false
let latitude, longitude;
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 {
width: 100%;
/* #ifdef MP || APP-PLUS */
@@ -965,7 +976,7 @@
.tabs_wrapper {
width: 720rpx;
-
+
margin: 0 auto;
margin-bottom: 21.05rpx;
// margin-left: -20rpx;
@@ -977,7 +988,7 @@
height: 60rpx;
position: absolute;
z-index: 888;
-
+
background-color: #fff;
right: 0rpx;
top: 0;
@@ -986,7 +997,7 @@
width: 40rpx;
height: 40rpx;
margin-top: 10rpx;
-
+
}
}
diff --git a/pages/plantGrass/plant_detail/index.vue b/pages/plantGrass/plant_detail/index.vue
index 3eecdea..349d75b 100644
--- a/pages/plantGrass/plant_detail/index.vue
+++ b/pages/plantGrass/plant_detail/index.vue
@@ -735,7 +735,7 @@
height: 51rpx;
margin-right: 20rpx;
- margin-top: 20rpx;
+ margin-top: 10rpx;
image {
width: 100%;
@@ -921,8 +921,8 @@
.picture,
uni-image {
- width: 78rpx;
- height: 78rpx;
+ width: 70rpx;
+ height: 70rpx;
border-radius: 100%;
}
diff --git a/pages/product/basicSet.vue b/pages/product/basicSet.vue
index 9526100..8cb46fd 100644
--- a/pages/product/basicSet.vue
+++ b/pages/product/basicSet.vue
@@ -137,7 +137,8 @@
<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> -->
- <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>
<input type="number" v-model="settle_cycle" placeholder="请输入 /周期单位为:天">
</view>
@@ -145,7 +146,7 @@
<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>
<input type="number" maxlength="5" v-model="interest_rate" placeholder="请输入 /利率单位为: %">
- </view>
+ </view> -->
<!-- <view class="remarks">*利率结算范围为:0.01 ~ 0.1 利率单位为:%</view> -->
<!-- <view class="item_cell">
<view class="if_btn flex_a_c_j_sb">
diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue
index 6dcb676..abb7252 100644
--- a/pages/product/list/index.vue
+++ b/pages/product/list/index.vue
@@ -113,7 +113,7 @@
</view>
<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'
@click='menuAction(kk, item.attrValue,item,index)'>
<view class="">
@@ -169,6 +169,7 @@
</view>
</scroll-view>
</view>
+
<view class="shuru" v-if="this.on_line == 1">
数量: <input type="number" v-model="data.number" placeholder="请输入">
</view>
diff --git a/pages/short_video/appSwiper/index.nvue b/pages/short_video/appSwiper/index.nvue
index 1daca8b..97050fa 100644
--- a/pages/short_video/appSwiper/index.nvue
+++ b/pages/short_video/appSwiper/index.nvue
@@ -149,7 +149,7 @@
<view class="picture">
<image class="image" :src="goods.spu.image"></image>
</view>
- <view class="product-text" >
+ <view class="product-text">
<text class="name line1"
v-if="goods.spu && goods.spu.store_name.length>=12">{{goods.spu.store_name.slice(0,12)}}...</text>
<text class="name line1"
@@ -226,7 +226,7 @@
<text class="count">{{item.relevance.length}}</text>
</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>
<navigator hover-class="none"
:url="'/pages/plantGrass/plant_release/index?id='+item.community_id+'&type=2'"
@@ -309,15 +309,15 @@
</view>
</uni-popup>
<!-- 他提到的宝贝弹窗 -->
- <uni-popup type="bottom" ref="pinglunMentioned">
- <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>
- </view>
+ <uni-popup type="bottom" ref="pinglunMentioned" style="background-color: rebeccapurple;">
+
+
+ <mentioned ref="mentioned" @close="closePopup" :list="moreList" :uid="authorUid" ></mentioned>
+
</uni-popup>
<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
<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()'>
<image class="icon-xiangzuo" src="../static/img/index/icon-back.png"></image>
</view>
@@ -358,7 +358,9 @@
import {
getUserInfo
} from '@/api/user.js';
-import { navigateBack } from '../../../libs/uniApi';
+ import {
+ navigateBack
+ } from '../../../libs/uniApi';
export default {
computed: configMap({
statusBarHeight: 0,
@@ -638,22 +640,19 @@ import { navigateBack } from '../../../libs/uniApi';
content: '确定要删除该话题么？',
success: function(res) {
if (res.confirm) {
- console.log(item.community_id)
+
deletePlantApi(item.community_id).then(res => {
- console.log(res)
+
+
if (res.status == 200) {
+
+ uni.navigateBack({
+ delta: 1,
+ })
+
that.$util.Tips({
title: res.message
});
- // setTimeout(function() {
- // uni.redirectTo({
- // url: '/pages/plantGrass/plant_user/index?id=' +
- // item.uid
- // })
- // }, 1000);
- uni.navigateBack({
- delta:1,
- })
}
})
@@ -862,7 +861,7 @@ import { navigateBack } from '../../../libs/uniApi';
},
scrolls(event) {
-
+
this.showManage = false;
this.isDragging = event.isDragging;
if (!event.isDragging) { //isDragging：判断用户是不是在滑动，滑动：true，停止滑动：false。我们要用户停止滑动时才给 k 赋值，这样就可以避免很多麻烦
@@ -1105,6 +1104,7 @@ import { navigateBack } from '../../../libs/uniApi';
}
</script>
<style lang="scss" scoped>
+
// .video-list{
// padding: 200rpx 28.07rpx 0 28.07rpx;
// display: flex;
@@ -1124,6 +1124,7 @@ import { navigateBack } from '../../../libs/uniApi';
/* #ifdef MP */
padding-top: 200rpx;
/* #endif */
+
// background-color: #000000;
background-color: #F5F5F5;
@@ -1246,10 +1247,12 @@ import { navigateBack } from '../../../libs/uniApi';
left: 0;
top: 70rpx;
height: 86rpx;
+ background-color: yellow;
.icon-xiangzuo {
+
margin-left: 10px;
width: 20px;
height: 20px;
@@ -1309,7 +1312,7 @@ import { navigateBack } from '../../../libs/uniApi';
width: 690rpx;
position: absolute;
left: 30rpx;
- background: #000;
+ // background: #000;
border-radius: 10rpx;
top: 150rpx;
padding: 30rpx;
@@ -1724,7 +1727,7 @@ import { navigateBack } from '../../../libs/uniApi';
}
.root {
- background-color: #000000;
+ // background-color: #000000;
}
</style>
\ No newline at end of file
diff --git a/pages/short_video/components/mentioned/mentioned.vue b/pages/short_video/components/mentioned/mentioned.vue
index 2ca20fe..6bc365c 100644
--- a/pages/short_video/components/mentioned/mentioned.vue
+++ b/pages/short_video/components/mentioned/mentioned.vue
@@ -96,11 +96,12 @@
width: 750rpx;
background-color: #ffffff;
border-radius: 16rpx 16rpx 0 0;
+
.header{
position: relative;
padding: 40rpx 30rpx;
.title{
- color: #282828;
+ // color: #282828;
font-size: 30rpx;
}
.closeBnt{
@@ -158,12 +159,12 @@
align-items: flex-end;
.sm{
font-weight: bold;
- color: #E93323;
+ color: #FF6D20;
font-size: 26rpx;
}
.text{
font-weight: bold;
- color: #E93323;
+ color: #FF6D20;
font-size: 34rpx;
}
}
@@ -175,7 +176,7 @@
justify-content: center;
font-size: 24rpx;
color: #fff;
- background: #E93323;
+ background: #FF6D20;
}
}
}
diff --git a/pages/supply_chains/supply_chains.vue b/pages/supply_chains/supply_chains.vue
index 9f4d616..639bc8d 100644
--- a/pages/supply_chains/supply_chains.vue
+++ b/pages/supply_chains/supply_chains.vue
@@ -17,6 +17,18 @@
</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"
@change="dchange">
@@ -574,6 +586,39 @@
// 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 {
background-color: #f6f6f6;
width: 680rpx;
diff --git a/pages/users/login/login_copy.vue b/pages/users/login/login_copy.vue
index 198c414..159220f 100644
--- a/pages/users/login/login_copy.vue
+++ b/pages/users/login/login_copy.vue
@@ -2,9 +2,9 @@
<div :style="viewColor">
<div class="register absolute" v-if="!auth_token">
<div class="login">
- <div class="shading">
- <div class="pictrue acea-row row-center-wrapper">
- <image :src="login_logo" v-if="login_logo" />
+ <div class="shading" >
+ <div class="pictrue acea-row row-center-wrapper" style="background-color: transparent !important;">
+ <image src="@/static/images/logo1.png" />
</div>
</div>
<div class="whiteBg" v-if="formItem === 1">