更新
This commit is contained in:
THK3121
commit
ad77103366
6
App.vue
6
App.vue
@ -149,7 +149,7 @@
|
||||
that.getConfigData()
|
||||
|
||||
//#ifdef APP-PLUS
|
||||
|
||||
this.checknetwork()
|
||||
|
||||
jpushModule.setLoggerEnable(true);
|
||||
jpushModule.initJPushService()
|
||||
@ -254,11 +254,11 @@
|
||||
uni.onNetworkStatusChange(function(res) {
|
||||
|
||||
if (res.isConnected) {
|
||||
|
||||
|
||||
uni.reLaunch({
|
||||
url: '/pages/index/index'
|
||||
})
|
||||
|
||||
|
||||
} else {
|
||||
|
||||
uni.showModal({
|
||||
|
||||
@ -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 : ''
|
||||
console.log(this.columnData)
|
||||
},
|
||||
|
||||
confirm(e) {
|
||||
|
||||
this.showPicker = false
|
||||
this.$emit('selectPlce', e)
|
||||
this.$emit('change', e)
|
||||
@ -266,7 +268,7 @@
|
||||
height: 66.67rpx;
|
||||
margin-bottom: 26.32rpx;
|
||||
position: relative;
|
||||
z-index: 9999;
|
||||
z-index: 0;
|
||||
|
||||
|
||||
// 位置
|
||||
|
||||
@ -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'
|
||||
@ -25,6 +25,7 @@ if (process.env.NODE_ENV === "development") {
|
||||
// #endif
|
||||
} else if (process.env.NODE_ENV === 'production') {
|
||||
httpApi = 'https://shop.lihaink.cn' // 生产
|
||||
|
||||
// httpApi = "https://crmeb-test.shop.lihaink.cn"
|
||||
httpApiTwo = 'https://nk.lihaink.cn' // 生产
|
||||
httpApiThree = 'http://ceshi-oa.lihaink.cn' //生产
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
"name" : "惠农生活",
|
||||
"appid" : "__UNI__3A527D1",
|
||||
"description" : "",
|
||||
"versionName" : "1.3.6",
|
||||
"versionCode" : 136,
|
||||
"versionName" : "1.3.8",
|
||||
"versionCode" : 138,
|
||||
"transformPx" : false,
|
||||
/* 5+App特有相关 */
|
||||
"app-plus" : {
|
||||
|
||||
@ -1617,7 +1617,7 @@
|
||||
"pagePath": "pages/gather/gather",
|
||||
"iconPath": "static/tabbar_icon/b.png",
|
||||
"selectedIconPath": "static/tabbar_icon/b-a.png",
|
||||
"text": "工作台"
|
||||
"text": "生产"
|
||||
},
|
||||
{
|
||||
"pagePath": "pages/plant_release/index",
|
||||
@ -1631,7 +1631,7 @@
|
||||
|
||||
"iconPath": "static/tabbar_icon/d.png",
|
||||
"selectedIconPath": "static/tabbar_icon/d-a.png",
|
||||
"text": "供应"
|
||||
"text": "供销"
|
||||
},
|
||||
{
|
||||
"pagePath": "pages/user/index",
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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()
|
||||
@ -237,21 +221,14 @@
|
||||
},
|
||||
|
||||
onTabItemTap(e) {
|
||||
|
||||
uni.pageScrollTo({
|
||||
selector: ".Circle_friends",
|
||||
scrollTop: 0
|
||||
})
|
||||
|
||||
|
||||
},
|
||||
onHide() {
|
||||
this.getGoods(true)
|
||||
|
||||
uni.pageScrollTo({
|
||||
selector: ".Circle_friends",
|
||||
scrollTop: 0
|
||||
})
|
||||
|
||||
uni.setTabBarItem({
|
||||
index: 0,
|
||||
text: "泸州",
|
||||
@ -263,19 +240,18 @@
|
||||
},
|
||||
onReachBottom() {
|
||||
|
||||
|
||||
if (this.productList.length > 0) {
|
||||
setTimeout(() => {
|
||||
this.getGoods(false);
|
||||
}, 1000)
|
||||
} else {
|
||||
this.get_host_product();
|
||||
}
|
||||
|
||||
},
|
||||
|
||||
mounted() {
|
||||
this.getUserInfo()
|
||||
|
||||
|
||||
this.selfLocation()
|
||||
// #ifdef H5
|
||||
// 监听页面滚动事件
|
||||
@ -431,8 +407,6 @@
|
||||
|
||||
},
|
||||
|
||||
|
||||
|
||||
tabsChange1(item) {
|
||||
|
||||
this.getArticleList(item.article_category_id)
|
||||
@ -603,7 +577,7 @@
|
||||
}, ...data]
|
||||
},
|
||||
tabsChange(item) {
|
||||
|
||||
|
||||
this.productList = []
|
||||
this.where.category_id = item.category_id
|
||||
this.emptyShow = false
|
||||
@ -615,9 +589,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 +601,7 @@
|
||||
this.getGoods(true)
|
||||
this.tabsData.tabsActive = index
|
||||
this.current = index
|
||||
|
||||
|
||||
},
|
||||
selfLocation() {
|
||||
|
||||
@ -641,6 +615,7 @@
|
||||
type: 'wgs84',
|
||||
timeout: '1000',
|
||||
success: (res) => {
|
||||
|
||||
this.isshow = false
|
||||
let latitude, longitude;
|
||||
latitude = res.latitude.toString();
|
||||
@ -895,6 +870,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 +972,7 @@
|
||||
|
||||
.tabs_wrapper {
|
||||
width: 720rpx;
|
||||
|
||||
|
||||
margin: 0 auto;
|
||||
margin-bottom: 21.05rpx;
|
||||
// margin-left: -20rpx;
|
||||
@ -977,7 +984,7 @@
|
||||
height: 60rpx;
|
||||
position: absolute;
|
||||
z-index: 888;
|
||||
|
||||
|
||||
background-color: #fff;
|
||||
right: 0rpx;
|
||||
top: 0;
|
||||
@ -986,7 +993,7 @@
|
||||
width: 40rpx;
|
||||
height: 40rpx;
|
||||
margin-top: 10rpx;
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -148,7 +148,7 @@
|
||||
<view class="empty" v-if='showLoading'>
|
||||
<u-loading-icon v-if='showLoading' text="加载中" textSize="18"></u-loading-icon>
|
||||
</view>
|
||||
<view class="goods" @click="godDetail(item)" v-else v-for="item,index in goodsList">
|
||||
<view class="goods" @click="goodDetail(item)" v-else v-for="item,index in goodsList">
|
||||
<view class="left">
|
||||
<u--image :showLoading="true" :src="item.image" width="192.76rpx"
|
||||
height="192.76rpx"></u--image>
|
||||
@ -737,7 +737,7 @@
|
||||
this.goodsNum = res.data[0].count
|
||||
})
|
||||
},
|
||||
godDetail(item) {
|
||||
goodDetail(item) {
|
||||
goShopDetail(item, this.uid).then(res => {
|
||||
if (this.isLogin) {
|
||||
initiateAssistApi(item.activity_id).then(res => {
|
||||
@ -1415,91 +1415,91 @@
|
||||
height: 35rpx;
|
||||
}
|
||||
|
||||
.cloud_entrepot {
|
||||
background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/ycbg.png") no-repeat;
|
||||
background-size: cover;
|
||||
padding-bottom: 92.98rpx;
|
||||
}
|
||||
// .cloud_entrepot {
|
||||
// background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/ycbg.png") no-repeat;
|
||||
// background-size: cover;
|
||||
// padding-bottom: 92.98rpx;
|
||||
// }
|
||||
|
||||
.head-wrapper {
|
||||
height: 485.96rpx;
|
||||
width: 100%;
|
||||
background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/top.png") no-repeat;
|
||||
background-size: cover;
|
||||
margin-bottom: 49.12rpx;
|
||||
}
|
||||
// .head-wrapper {
|
||||
// height: 485.96rpx;
|
||||
// width: 100%;
|
||||
// background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/top.png") no-repeat;
|
||||
// background-size: cover;
|
||||
// margin-bottom: 49.12rpx;
|
||||
// }
|
||||
|
||||
.town-title {
|
||||
margin: 0 auto;
|
||||
width: 100%;
|
||||
text-align: center;
|
||||
font-size: 50.88rpx;
|
||||
color: #fff;
|
||||
margin-bottom: 28.07rpx;
|
||||
// .town-title {
|
||||
// margin: 0 auto;
|
||||
// width: 100%;
|
||||
// text-align: center;
|
||||
// font-size: 50.88rpx;
|
||||
// color: #fff;
|
||||
// margin-bottom: 28.07rpx;
|
||||
|
||||
&::after {
|
||||
content: '';
|
||||
display: inline-block;
|
||||
width: 66.67rpx;
|
||||
height: 31.58rpx;
|
||||
background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/you.png") no-repeat;
|
||||
background-size: cover;
|
||||
margin-left: 24.56rpx;
|
||||
}
|
||||
// &::after {
|
||||
// content: '';
|
||||
// display: inline-block;
|
||||
// width: 66.67rpx;
|
||||
// height: 31.58rpx;
|
||||
// background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/you.png") no-repeat;
|
||||
// background-size: cover;
|
||||
// margin-left: 24.56rpx;
|
||||
// }
|
||||
|
||||
&::before {
|
||||
content: '';
|
||||
display: inline-block;
|
||||
width: 66.67rpx;
|
||||
height: 31.58rpx;
|
||||
background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/zuo.png") no-repeat;
|
||||
background-size: cover;
|
||||
margin-right: 24.56rpx;
|
||||
}
|
||||
}
|
||||
// &::before {
|
||||
// content: '';
|
||||
// display: inline-block;
|
||||
// width: 66.67rpx;
|
||||
// height: 31.58rpx;
|
||||
// background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/zuo.png") no-repeat;
|
||||
// background-size: cover;
|
||||
// margin-right: 24.56rpx;
|
||||
// }
|
||||
// }
|
||||
|
||||
|
||||
.body-wrapper {
|
||||
width: 694.74rpx;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
flex-wrap: wrap;
|
||||
margin: 0 auto;
|
||||
// .body-wrapper {
|
||||
// width: 694.74rpx;
|
||||
// display: flex;
|
||||
// justify-content: space-between;
|
||||
// flex-wrap: wrap;
|
||||
// margin: 0 auto;
|
||||
|
||||
.item {
|
||||
width: 336.84rpx;
|
||||
height: 100%;
|
||||
padding: 24.56rpx 28.07rpx;
|
||||
margin-bottom: 21.05rpx;
|
||||
background-repeat: no-repeat;
|
||||
background-size: 100% 100%;
|
||||
box-sizing: border-box;
|
||||
// .item {
|
||||
// width: 336.84rpx;
|
||||
// height: 100%;
|
||||
// padding: 24.56rpx 28.07rpx;
|
||||
// margin-bottom: 21.05rpx;
|
||||
// background-repeat: no-repeat;
|
||||
// background-size: 100% 100%;
|
||||
// box-sizing: border-box;
|
||||
|
||||
text {
|
||||
display: block;
|
||||
font-size: 24.56rpx;
|
||||
color: #999;
|
||||
margin-bottom: 14.04rpx;
|
||||
}
|
||||
// text {
|
||||
// display: block;
|
||||
// font-size: 24.56rpx;
|
||||
// color: #999;
|
||||
// margin-bottom: 14.04rpx;
|
||||
// }
|
||||
|
||||
.item-title {
|
||||
font-size: 31.58rpx;
|
||||
color: #333;
|
||||
}
|
||||
// .item-title {
|
||||
// font-size: 31.58rpx;
|
||||
// color: #333;
|
||||
// }
|
||||
|
||||
.chakan-btn {
|
||||
width: 114.04rpx;
|
||||
height: 49.12rpx;
|
||||
font-size: 28.07rpx;
|
||||
text-align: center;
|
||||
line-height: 49.12rpx;
|
||||
color: #fff;
|
||||
margin-top: auto;
|
||||
background: linear-gradient(90deg, #FE5300 0%, #F84221 100%);
|
||||
border-radius: 50px;
|
||||
}
|
||||
}
|
||||
}
|
||||
// .chakan-btn {
|
||||
// width: 114.04rpx;
|
||||
// height: 49.12rpx;
|
||||
// font-size: 28.07rpx;
|
||||
// text-align: center;
|
||||
// line-height: 49.12rpx;
|
||||
// color: #fff;
|
||||
// margin-top: auto;
|
||||
// background: linear-gradient(90deg, #FE5300 0%, #F84221 100%);
|
||||
// border-radius: 50px;
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
.empty {
|
||||
// display: flex;
|
||||
|
||||
@ -745,7 +745,7 @@
|
||||
height: 51rpx;
|
||||
margin-right: 20rpx;
|
||||
|
||||
margin-top: 20rpx;
|
||||
margin-top: 10rpx;
|
||||
|
||||
image {
|
||||
width: 100%;
|
||||
@ -931,8 +931,8 @@
|
||||
|
||||
.picture,
|
||||
uni-image {
|
||||
width: 78rpx;
|
||||
height: 78rpx;
|
||||
width: 70rpx;
|
||||
height: 70rpx;
|
||||
border-radius: 100%;
|
||||
}
|
||||
|
||||
|
||||
@ -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">
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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'"
|
||||
@ -304,20 +304,20 @@
|
||||
deleteAndroidHeight
|
||||
这两个参数用于控制评论等的高度
|
||||
-->
|
||||
<douyin-scrollview ref="comments" :deleteIOSHeight="36" :deleteAndroidHeight="15" :userInfo="userInfo"
|
||||
<douyin-scrollview ref="comments" :deleteIOSHeight="36" :deleteAndroidHeight="15" :userInfo="userInfo"
|
||||
@closeScrollview="closeScrollview" @successFul="pinlunFun"></douyin-scrollview>
|
||||
</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>
|
||||
@ -640,10 +640,16 @@
|
||||
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
|
||||
});
|
||||
@ -1107,6 +1113,7 @@
|
||||
}
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
|
||||
// .video-list{
|
||||
// padding: 200rpx 28.07rpx 0 28.07rpx;
|
||||
// display: flex;
|
||||
@ -1126,6 +1133,7 @@
|
||||
/* #ifdef MP */
|
||||
padding-top: 200rpx;
|
||||
/* #endif */
|
||||
|
||||
// background-color: #000000;
|
||||
background-color: #F5F5F5;
|
||||
|
||||
@ -1248,15 +1256,19 @@
|
||||
left: 0;
|
||||
top: 70rpx;
|
||||
height: 86rpx;
|
||||
|
||||
|
||||
|
||||
|
||||
.icon-xiangzuo {
|
||||
|
||||
margin-left: 10px;
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
color: #ffffff;
|
||||
|
||||
}
|
||||
padding-right: 30rpx;
|
||||
}
|
||||
|
||||
.header {
|
||||
@ -1311,7 +1323,7 @@
|
||||
width: 690rpx;
|
||||
position: absolute;
|
||||
left: 30rpx;
|
||||
background: #000;
|
||||
// background: #000;
|
||||
border-radius: 10rpx;
|
||||
top: 150rpx;
|
||||
padding: 30rpx;
|
||||
@ -1726,7 +1738,7 @@
|
||||
}
|
||||
|
||||
.root {
|
||||
background-color: #000000;
|
||||
// background-color: #000000;
|
||||
|
||||
}
|
||||
</style>
|
||||
@ -451,9 +451,10 @@
|
||||
left: 0;
|
||||
background: #ffffff;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
// align-items: center;
|
||||
justify-content: space-between;
|
||||
padding: 15rpx 30rpx;
|
||||
padding: 30rpx 60rpx;
|
||||
padding-bottom: 100rpx;
|
||||
border-top: 1rpx solid #F5F5F5;
|
||||
flex-direction: row;
|
||||
width:750rpx;
|
||||
@ -466,7 +467,7 @@
|
||||
width: 480rpx;
|
||||
background: #F7F7F7;
|
||||
border-radius: 31rpx;
|
||||
padding: 12rpx 30rpx;
|
||||
padding: 15rpx 30rpx;
|
||||
}
|
||||
.send{
|
||||
font-size: 26rpx;
|
||||
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -19,13 +19,7 @@
|
||||
placeholder-class='placeholder' />
|
||||
</view>
|
||||
</view>
|
||||
<view class="item">
|
||||
<view class="acea-row row-middle">
|
||||
<text class="item-name">用户姓名</text>
|
||||
<input type="text" placeholder="请输入姓名" v-model="merchantData.user_name" @input="validateBtn"
|
||||
placeholder-class='placeholder' />
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="item">
|
||||
<view class="acea-row row-middle">
|
||||
<text class="item-name">联系电话</text>
|
||||
@ -102,6 +96,53 @@
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="item">
|
||||
<view class="uni-list">
|
||||
<view class="uni-list-cell">
|
||||
<view class="uni-list-cell-db acea-row row-middle">
|
||||
<text class="item-name businessBox">详细地址</text>
|
||||
<input type="text" maxlength="30" placeholder="请输入详细地址"
|
||||
v-model="merchantData.address" @input="validateBtn"
|
||||
placeholder-class='placeholder' />
|
||||
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="item">
|
||||
<view class="uni-list">
|
||||
<view class="uni-list-cell">
|
||||
<view class="uni-list-cell-db acea-row row-middle">
|
||||
<text class="item-name businessBox">公司名称</text>
|
||||
<input type="text" maxlength="30" placeholder="请输入公司名称"
|
||||
v-model="merchantData.company_name" @input="validateBtn"
|
||||
placeholder-class='placeholder' />
|
||||
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="item">
|
||||
<view class="acea-row row-middle">
|
||||
<text class="item-name">法人名称</text>
|
||||
<input type="text" placeholder="请输入法人名称" v-model="merchantData.user_name" @input="validateBtn"
|
||||
placeholder-class='placeholder' />
|
||||
</view>
|
||||
</view>
|
||||
<view class="item">
|
||||
<view class="uni-list">
|
||||
<view class="uni-list-cell">
|
||||
<view class="uni-list-cell-db acea-row row-middle">
|
||||
<text class="item-name businessBox">社会信用代码</text>
|
||||
<input type="text" maxlength="30" placeholder="请输入社会信用代码"
|
||||
v-model="merchantData.social_credit_code" @input="validateBtn"
|
||||
placeholder-class='placeholder' />
|
||||
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- <view class="item">
|
||||
<view class="acea-row row-middle">
|
||||
<text class="item-name">是否农贸市场</text>
|
||||
@ -230,7 +271,10 @@
|
||||
enterprise_name: "",
|
||||
user_name: "",
|
||||
phone: "",
|
||||
classification: ''
|
||||
classification: '',
|
||||
social_credit_code: '',
|
||||
company_name: '',
|
||||
address: ''
|
||||
},
|
||||
validate: false,
|
||||
successful: false,
|
||||
@ -374,12 +418,16 @@
|
||||
this.merchantData.enterprise_name = resData.mer_name
|
||||
this.merchantData.user_name = resData.name
|
||||
this.merchantData.phone = resData.phone
|
||||
this.merchantData.social_credit_code = resData.social_credit_code
|
||||
this.merchantData.company_name = resData.company_name
|
||||
this.merchantData.address = resData.address
|
||||
this.merchantData.classification = resData.merchant_category_id
|
||||
this.merchantData.mer_type = resData.mer_type_id
|
||||
this.area_id=resData.area_id
|
||||
this.street_id=resData.street_id
|
||||
this.mer_storeType=resData.mer_storeType
|
||||
this.village_id=resData.village_id
|
||||
this.area_id = resData.area_id
|
||||
this.street_id = resData.street_id
|
||||
this.mer_storeType = resData.mer_storeType
|
||||
this.village_id = resData.village_id
|
||||
|
||||
})
|
||||
this.pics = resData.images
|
||||
this.mer_classification = this.getCategoryName(resData.merchant_category_id, this.array)
|
||||
@ -594,9 +642,12 @@
|
||||
mer_name: that.merchantData.enterprise_name,
|
||||
name: that.merchantData.user_name,
|
||||
code: that.merchantData.yanzhengma,
|
||||
company_name:that.merchantData.company_name,
|
||||
address:that.merchantData.address,
|
||||
social_credit_code: that.merchantData.social_credit_code,
|
||||
merchant_category_id: that.merchantData.classification,
|
||||
mer_type_id: that.merchantData.mer_type,
|
||||
mer_storeType:this.mer_storeType,
|
||||
mer_storeType: this.mer_storeType,
|
||||
area_id: this.area_id,
|
||||
street_id: this.street_id,
|
||||
village_id: this.village_id,
|
||||
@ -666,6 +717,15 @@
|
||||
if (!value.enterprise_name) return that.$util.Tips({
|
||||
title: '请输入企业名称'
|
||||
});
|
||||
if (!value.social_credit_code) return that.$util.Tips({
|
||||
title: '请输入统一社会信用代码'
|
||||
});
|
||||
if (!value.company_name) return that.$util.Tips({
|
||||
title: '请输入公司名称'
|
||||
});
|
||||
if (!value.address) return that.$util.Tips({
|
||||
title: '请输入详细地址'
|
||||
});
|
||||
if (!value.user_name) return that.$util.Tips({
|
||||
title: '请输入姓名'
|
||||
});
|
||||
@ -681,11 +741,11 @@
|
||||
if (!value.classification) return that.$util.Tips({
|
||||
title: '请选择商户分类'
|
||||
});
|
||||
if(!this.mer_storeType) return that.$util.Tips({
|
||||
title:'请选择商户类型'
|
||||
if (!this.mer_storeType) return that.$util.Tips({
|
||||
title: '请选择商户类型'
|
||||
})
|
||||
if(!this.business_name) return that.$util.Tips({
|
||||
title:'请选择店铺所在地'
|
||||
if (!this.business_name) return that.$util.Tips({
|
||||
title: '请选择店铺所在地'
|
||||
})
|
||||
if (!that.isAgree) return that.$util.Tips({
|
||||
title: '请勾选并同意入驻协议'
|
||||
@ -709,6 +769,7 @@
|
||||
if (!this.merchantData.phone) return this.$util.Tips({
|
||||
title: '请输入手机号'
|
||||
});
|
||||
|
||||
if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(this.merchantData.phone)) return this.$util.Tips({
|
||||
title: '请输入正确的手机号码'
|
||||
});
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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">
|
||||
|
||||
@ -103,13 +103,13 @@
|
||||
<text class='iconfont icon-you'></text>
|
||||
</navigator>
|
||||
</view>
|
||||
<view class='item acea-row row-between-wrapper'>
|
||||
<!-- <view class='item acea-row row-between-wrapper'>
|
||||
<view>注销账号</view>
|
||||
<view class='input acea-row row-between-wrapper' @click="changeCancel">
|
||||
<input type='text' placeholder="账号注销后不能恢复" disabled='true' class='id'></input>
|
||||
<text class='iconfont icon-you'></text>
|
||||
</view>
|
||||
</view>
|
||||
</view> -->
|
||||
<!--#ifdef APP-PLUS-->
|
||||
<view class='item acea-row row-between-wrapper'>
|
||||
<view>当前版本</view>
|
||||
|
||||
BIN
static/images/fx.png
Normal file
BIN
static/images/fx.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.2 KiB |
BIN
static/images/logo1.png
Normal file
BIN
static/images/logo1.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 27 KiB |
@ -117,38 +117,52 @@ const actions = {
|
||||
} else {
|
||||
apptype = 1
|
||||
}
|
||||
|
||||
Appversion({
|
||||
version: os.appWgtVersion,
|
||||
type: apptype
|
||||
type: apptype,
|
||||
phone_brand: os.brand
|
||||
|
||||
}).then((res) => {
|
||||
|
||||
|
||||
if (Object.keys(res.data.appInfo).length > 0) {
|
||||
|
||||
|
||||
// if(res.data.appInfo.version) uni.showLoading({
|
||||
// if(res.data.appInfo.version) uni.showLoading({
|
||||
// title: '检查更新中'
|
||||
// })
|
||||
|
||||
// 版本更新
|
||||
if (compareVersions(res.data.appInfo.version, os.appWgtVersion || wgt_v) == 1 &&
|
||||
compareVersions(res.data.appInfo.version,
|
||||
wgt_v) == 1) {
|
||||
try {
|
||||
let info = res.data.appInfo || {};
|
||||
let version = {
|
||||
title: info.title || '发现新版本',
|
||||
content: info.content || '修复了部分BUG',
|
||||
versionName: info.version || '1.0.1',
|
||||
downUrl: info.dow_url || '',
|
||||
force: info.force == 1 ? true : false, // 是否强制更新
|
||||
quiet: info.quiet == 1 ? true : false // 是否静默更新
|
||||
}
|
||||
Updater.update(version);
|
||||
} catch (e) {
|
||||
console.log(e);
|
||||
if (res.data.appInfo.phone_brand.length > 0) {
|
||||
if (plus.os.name == "Android") {
|
||||
// 跳转安卓应用市场
|
||||
let appurl = res.data.appInfo.dow_url //这个是通用应用市场，如果想指定某个应用商店，需要单独查这个应用商店的包名或scheme及参数
|
||||
plus.runtime.openURL(appurl)
|
||||
} else {
|
||||
// 跳转AppStore
|
||||
plus.runtime.launchApplication({
|
||||
action: res.data.appInfo.dow_url,
|
||||
})
|
||||
}
|
||||
} else {
|
||||
|
||||
// 版本更新
|
||||
if (compareVersions(res.data.appInfo.version, os.appWgtVersion || wgt_v) == 1 &&
|
||||
compareVersions(res.data.appInfo.version,
|
||||
wgt_v) == 1) {
|
||||
try {
|
||||
let info = res.data.appInfo || {};
|
||||
let version = {
|
||||
title: info.title || '发现新版本',
|
||||
content: info.content || '修复了部分BUG',
|
||||
versionName: info.version || '1.0.1',
|
||||
downUrl: info.dow_url || '',
|
||||
force: info.force == 1 ? true : false, // 是否强制更新
|
||||
quiet: info.quiet == 1 ? true : false // 是否静默更新
|
||||
}
|
||||
Updater.update(version);
|
||||
} catch (e) {
|
||||
console.log(e);
|
||||
}
|
||||
// uni.hideLoading();
|
||||
}
|
||||
// uni.hideLoading();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user