Merge branch 'old' of https://gitea.lihaink.cn/mkm/nk-shop2.0 into old
@ -15,18 +15,21 @@ const env = 'dev'; // 开发
|
||||
switch (env) {
|
||||
case 'prod':
|
||||
httpApi = 'https://shop.lihaink.cn' // 生产
|
||||
httpApiTwo = 'https://nk.lihaink.cn'
|
||||
httpApiThree = 'http://ceshi-oa.lihaink.cn'
|
||||
httpApiTwo = 'https://nk.lihaink.cn'
|
||||
httpApiThree = 'http://ceshi-oa.lihaink.cn'
|
||||
httpApiFour = 'https://worker-task.lihaink.cn'
|
||||
break;
|
||||
case 'prew':
|
||||
httpApi = 'https://test.shop.lihaink.cn' //预发布环境
|
||||
httpApiTwo = "https://nk.lihaink.cn"
|
||||
httpApiThree = 'http://ceshi-oa.lihaink.cn'
|
||||
httpApiTwo = "https://nk.lihaink.cn"
|
||||
httpApiThree = 'http://ceshi-oa.lihaink.cn'
|
||||
httpApiFour = 'https://preview-worker-task.lihaink.cn'
|
||||
break;
|
||||
default:
|
||||
httpApi = "https://crmeb-test.shop.lihaink.cn" // 生产
|
||||
httpApiTwo = "https://nk.lihaink.cn"
|
||||
httpApiThree = 'http://ceshi-oa.lihaink.cn'
|
||||
httpApi = "https://crmeb-test.shop.lihaink.cn" // 测试
|
||||
httpApiTwo = "https://nk.lihaink.cn"
|
||||
httpApiThree = 'http://ceshi-oa.lihaink.cn'
|
||||
httpApiFour = 'https://ceshi-worker-task.lihaink.cn'
|
||||
}
|
||||
|
||||
|
||||
@ -35,7 +38,7 @@ switch (env) {
|
||||
// if (process.env.NODE_ENV === "development") {
|
||||
// httpApi = 'https://shop.lihaink.cn' // 生产
|
||||
// // httpApi = 'https://test.shop.lihaink.cn' //预发布环境
|
||||
|
||||
|
||||
// // httpApi = "https://crmeb-test.shop.lihaink.cn"
|
||||
// // httpApi = "http://192.168.0.222"
|
||||
// // httpApi = "http://192.168.0.108:8325"
|
||||
@ -48,7 +51,7 @@ switch (env) {
|
||||
// // 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' // 生产
|
||||
@ -73,11 +76,13 @@ module.exports = {
|
||||
HTTP_REQUEST_URL: httpApi,
|
||||
HTTP_REQUEST_URL_TWO: httpApiTwo,
|
||||
HTTP_REQUEST_URL_THREE: httpApiThree,
|
||||
HTTP_REQUEST_URL_FOUR: httpApiFour,
|
||||
VUE_APP_WS_URL: `${wsApi}?type=user`,
|
||||
// #endif
|
||||
|
||||
|
||||
// #ifdef H5
|
||||
//H5接口是浏览器地址
|
||||
HTTP_REQUEST_URL_FOUR: httpApiFour|| window.location.protocol + "//" + window.location.host,
|
||||
HTTP_REQUEST_URL: httpApi || window.location.protocol + "//" + window.location.host,
|
||||
HTTP_REQUEST_URL_TWO: httpApiTwo || window.location.protocol + "//" + window.location.host,
|
||||
// 聊天长连接地址
|
||||
|
@ -2,8 +2,8 @@
|
||||
"name" : "惠农生活",
|
||||
"appid" : "__UNI__3A527D1",
|
||||
"description" : "",
|
||||
"versionName" : "1.4.1",
|
||||
"versionCode" : 141,
|
||||
"versionName" : "1.4.3",
|
||||
"versionCode" : 143,
|
||||
"transformPx" : false,
|
||||
/* 5+App特有相关 */
|
||||
"app-plus" : {
|
||||
|
@ -124,7 +124,7 @@
|
||||
}, {
|
||||
"path": "pages/moreProject/moreProject",
|
||||
"style": {
|
||||
"navigationBarTitleText": "更多功能",
|
||||
"navigationBarTitleText": "商户平台",
|
||||
"enablePullDownRefresh": false
|
||||
}
|
||||
|
||||
|
@ -183,7 +183,7 @@
|
||||
</image>
|
||||
<text class="text">商户设置</text>
|
||||
</view>
|
||||
<view class="examine" @click="margin(`/pages/margin/margin`)">
|
||||
<view class="examine" @click="margin(`/pages/margin/margin`)">
|
||||
<image class="icon_img" src="@/static/images/jy.png">
|
||||
</image>
|
||||
<text class="text">保证缴纳金</text>
|
||||
@ -302,7 +302,8 @@
|
||||
</image>
|
||||
<text class="text">商户设置</text>
|
||||
</view>
|
||||
<view class="examine" @click="navigator(`/pages/margin/margin`)">
|
||||
|
||||
<view class="examine" @click="navigator(`/pages/margin/margin`)">
|
||||
<image class="icon_img" src="@/static/images/jy.png">
|
||||
</image>
|
||||
<text class="text">保证缴纳金</text>
|
||||
@ -373,7 +374,7 @@
|
||||
</image>
|
||||
<text class="text">商户设置</text>
|
||||
</view>
|
||||
<view class="examine" @click="navigator(`/pages/margin/margin`)">
|
||||
<view class="examine" @click="navigator(`/pages/margin/margin`)">
|
||||
<image class="icon_img" src="@/static/images/jy.png">
|
||||
</image>
|
||||
<text class="text">保证缴纳金</text>
|
||||
@ -398,11 +399,6 @@
|
||||
</view>
|
||||
|
||||
|
||||
<view class="examine" @click="navigator(`/pages/margin/margin`)">
|
||||
<image class="icon_img" src="@/static/images/jy.png" >
|
||||
</image>
|
||||
<text class="text">保证缴纳金</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -415,7 +411,11 @@
|
||||
</view>
|
||||
<view class="settlementAgreement" v-if="isFshow">
|
||||
<view class="setAgCount" style="width: 100%;height: 100%;">
|
||||
<i class="icon iconfont icon-cha" @click="recuo"></i>
|
||||
<!-- <i class="icon iconfont icon-cha" @click="recuo"></i> -->
|
||||
<view class="" style="width: 60rpx;height: 60rpx; position: absolute;right: 30rpx; top:20rpx"
|
||||
@click="recuo">
|
||||
<image src="@/static/images/close.png" mode="aspectFit" style="width: 60rpx;height: 60rpx;"></image>
|
||||
</view>
|
||||
<div class="title">{{detail.title}}</div>
|
||||
<view style="margin: 20rpx 0;">甲方公司:{{company?company:"暂无公司信息"}}</view>
|
||||
<view style="margin: 20rpx 0;">机构代码:{{organization_code?organization_code:"暂无公司信息"}}</view>
|
||||
@ -428,7 +428,6 @@
|
||||
拒绝
|
||||
</button>
|
||||
|
||||
|
||||
<button :class="num>0?'setAgCountbtnb':'setAgCountbtnc'" :disabled="num!=0" @click="agree">
|
||||
<text v-if="num>0">请仔细阅读协议{{num}}S</text>
|
||||
<text v-else>同意</text>
|
||||
@ -443,8 +442,9 @@
|
||||
<view class="userpage-icon" @click="close">
|
||||
<image src="@/static/images/close.png" mode=""></image>
|
||||
</view>
|
||||
<form report-submit='true'>
|
||||
<view class='merchantsSettled'>
|
||||
|
||||
<form report-submit='true' style="height: 90%;">
|
||||
<view class='merchantsSettled' :style="{'height':Fheight}">
|
||||
<view class="title">填写信息</view>
|
||||
<view class='list'>
|
||||
<view class="item">
|
||||
@ -570,7 +570,7 @@
|
||||
data() {
|
||||
return {
|
||||
company: '',
|
||||
organization_code:'',
|
||||
organization_code: '',
|
||||
locationArr: ({}),
|
||||
emptyText: '暂无可用应用',
|
||||
jurisdiction: false, // 是否有权限
|
||||
@ -605,6 +605,7 @@
|
||||
cardno_front: '',
|
||||
cardno_back: ''
|
||||
},
|
||||
Fheight:0,
|
||||
|
||||
};
|
||||
},
|
||||
@ -612,7 +613,10 @@
|
||||
...mapGetters(['userInfo', 'isLogin'])
|
||||
},
|
||||
created() {},
|
||||
onLoad() {},
|
||||
onLoad() {
|
||||
this.Fheight = uni.getSystemInfoSync().windowHeight+'px';
|
||||
console.log(this.Fheight)
|
||||
},
|
||||
onShow() {
|
||||
if (this.isLogin) {
|
||||
this.emptyText = '暂无可用应用'
|
||||
@ -624,8 +628,6 @@
|
||||
this.getUserInfo()
|
||||
this.codelist()
|
||||
this.list()
|
||||
|
||||
|
||||
},
|
||||
|
||||
|
||||
@ -643,7 +645,7 @@
|
||||
})
|
||||
},
|
||||
|
||||
|
||||
|
||||
//提交
|
||||
formSubmit: function(e) {
|
||||
let that = this;
|
||||
@ -842,10 +844,17 @@
|
||||
}
|
||||
|
||||
},
|
||||
//保证金缴纳
|
||||
margin(url) {
|
||||
uni.navigateTo({
|
||||
url: url+`?mer_id=` + this.mer_id
|
||||
})
|
||||
if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) {
|
||||
this.isFshow = true
|
||||
this.countDown()
|
||||
} else {
|
||||
uni.navigateTo({
|
||||
url: url + `?mer_id=` + this.mer_id
|
||||
})
|
||||
}
|
||||
|
||||
},
|
||||
//商户设置
|
||||
buyserset() {
|
||||
@ -868,20 +877,20 @@
|
||||
getUserInfo().then(res => {
|
||||
this.userInfoData = res.data;
|
||||
this.merchantData.phone = res.data.phone
|
||||
merstreet({
|
||||
street_code: res.data.mer_info.street_id
|
||||
}).then((res) => {
|
||||
if(res.code==0){
|
||||
this.$util.Tips({
|
||||
title: res.msg
|
||||
});
|
||||
return false;
|
||||
}
|
||||
this.company=res.data.title
|
||||
this.organization_code=res.data.organization_code
|
||||
}).catch(res=>{
|
||||
console.log(res)
|
||||
})
|
||||
merstreet({
|
||||
street_code: res.data.mer_info.street_id
|
||||
}).then((res) => {
|
||||
if (res.code == 0) {
|
||||
this.$util.Tips({
|
||||
title: res.msg
|
||||
});
|
||||
return false;
|
||||
}
|
||||
this.company = res.data.title
|
||||
this.organization_code = res.data.organization_code
|
||||
}).catch(res => {
|
||||
console.log(res)
|
||||
})
|
||||
if (res.data.service == null) {
|
||||
// console.log('123');
|
||||
this.isShow = false
|
||||
@ -896,7 +905,7 @@
|
||||
// console.log(that.userInfoData);
|
||||
});
|
||||
},
|
||||
|
||||
|
||||
//获取协议内容
|
||||
list() {
|
||||
business({
|
||||
@ -916,8 +925,8 @@
|
||||
|
||||
.userpage {
|
||||
width: 100%;
|
||||
height: 1368rpx;
|
||||
padding-top: 150rpx;
|
||||
|
||||
|
||||
background-color: #fff;
|
||||
position: relative;
|
||||
}
|
||||
@ -926,7 +935,7 @@
|
||||
width: 60rpx;
|
||||
height: 60rpx;
|
||||
position: absolute;
|
||||
top: 60rpx;
|
||||
top: 65rpx;
|
||||
right: 60rpx;
|
||||
|
||||
image {
|
||||
@ -940,7 +949,8 @@
|
||||
}
|
||||
|
||||
.merchantsSettled {
|
||||
height: 1368rpx;
|
||||
height: 100%;
|
||||
padding-top: 80rpx;
|
||||
}
|
||||
|
||||
.merchantsSettled .title {
|
||||
@ -953,12 +963,8 @@
|
||||
.merchantsSettled .list {
|
||||
background-color: #fff;
|
||||
border-radius: 12px;
|
||||
|
||||
margin: 0 15px;
|
||||
position: absolute;
|
||||
|
||||
width: calc(100% - 30px);
|
||||
|
||||
}
|
||||
|
||||
.application-record {
|
||||
@ -977,7 +983,6 @@
|
||||
.item-card {
|
||||
display: flex;
|
||||
margin-top: 20rpx;
|
||||
|
||||
.item-carda {
|
||||
width: 298rpx;
|
||||
height: 175rpx;
|
||||
@ -1133,6 +1138,7 @@
|
||||
width: 588rpx;
|
||||
margin: 0 auto;
|
||||
height: 86rpx;
|
||||
|
||||
border-radius: 25px;
|
||||
text-align: center;
|
||||
line-height: 86rpx;
|
||||
@ -1203,27 +1209,15 @@
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.settlementAgreement .setAgCount .content {
|
||||
margin-top: 32rpx;
|
||||
color: #333;
|
||||
font-size: 26rpx;
|
||||
line-height: 22px;
|
||||
text-align: justify;
|
||||
text-justify: distribute-all-lines;
|
||||
height: 1050rpx;
|
||||
overflow-y: scroll;
|
||||
}
|
||||
|
||||
|
||||
.settlementAgreement .setAgCount .contenta {
|
||||
margin-top: 32rpx;
|
||||
|
||||
color: #333;
|
||||
font-size: 26rpx;
|
||||
line-height: 22px;
|
||||
text-align: justify;
|
||||
text-justify: distribute-all-lines;
|
||||
|
||||
height: 1050rpx;
|
||||
height: 75%;
|
||||
|
||||
overflow-y: scroll;
|
||||
|
||||
|
@ -1,20 +1,5 @@
|
||||
<template>
|
||||
<view class="">
|
||||
<!-- <view class="cloud_entrepot" :style="{'min-height': winHeight + 'px'}">
|
||||
<view class="head-wrapper"></view>
|
||||
<view class="town-title">{{town}}里海云仓</view>
|
||||
<view class="body-wrapper">
|
||||
<block v-for="(item,index) in cloudList" :key="index">
|
||||
<navigator class="item"
|
||||
:url="`/pages/nongKe/goods_list/index?cate_id=${item.category_id}&street=${street_code}&name=${item.category_name}`"
|
||||
:style="{'background-image': `url(${item.background})`}">
|
||||
<text class="item-title">{{item.category_name}}云仓服务</text>
|
||||
<text>{{item.description}}</text>
|
||||
<view class="chakan-btn">查看</view>
|
||||
</navigator>
|
||||
</block>
|
||||
</view>
|
||||
</view> -->
|
||||
|
||||
<view class="">
|
||||
<view class="">
|
||||
@ -25,24 +10,14 @@
|
||||
width="50.82rpx" height="50.82rpx" @click='goBack'></u--image>
|
||||
<u--image v-else :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx"
|
||||
height="50.82rpx" @click='goBack'></u--image>
|
||||
<view class="head_tit" :style="{color:cloudList.length>0?'':'black'}">
|
||||
<view class="head_tit" v-if="cloudList.length"
|
||||
style="font-size: 40rpx;transform: skewX(-10deg);font-weight: bold;"
|
||||
:style="{color:cloudList.length>0?'':'black'}">
|
||||
{{town}}里海云仓
|
||||
</view>
|
||||
<view class="sl" :class="{actsl:showSelect}" @click="showSelect=!showSelect">
|
||||
<u--image :showLoading="true" src="/static/images/GXSC/BSL.png" width="33.29rpx"
|
||||
height="33.29rpx"></u--image>
|
||||
</view>
|
||||
</view>
|
||||
<view class="" style="display: flex;align-items: center;">
|
||||
<view style="display: flex;align-items: center;z-index: 999999;">
|
||||
<u--image :showLoading="true" v-if="cloudList.length>0"
|
||||
src="/static/images/LHYC/DWB.png" width="50.82rpx" height="50.82rpx"></u--image>
|
||||
<u--image :showLoading="true" v-else src="/static/images/LHYC/DWB1.png" width="50.82rpx"
|
||||
height="50.82rpx"></u--image>
|
||||
<view class="town_name" :style="{color:cloudList.length>0?'':'black'}"
|
||||
@click="showpick">{{street}}</view>
|
||||
</view>
|
||||
<view class="head_r" @click="showPop=true">
|
||||
<view class="head_r" @click="showPop=true" v-if="cloudList.length>0">
|
||||
<u--image v-if="cloudList.length>0" :showLoading="true" src="/static/images/LHYC/QB.png"
|
||||
width="50.82rpx" height="50.82rpx"></u--image>
|
||||
<u--image v-else :showLoading="true" src="/static/images/LHYC/QB1.png" width="50.82rpx"
|
||||
@ -50,22 +25,9 @@
|
||||
</view>
|
||||
|
||||
</view>
|
||||
|
||||
|
||||
</view>
|
||||
|
||||
<view class="selected-list" :style="`top:${headtop}px`" :class="{actSel:showSelect}">
|
||||
<div class="triangle-up"></div>
|
||||
<view
|
||||
@click="navgo(`/pages/nongKe/supply_chain/supplier?type_id=10&street_id=${street_code}&townName=${street}`)">
|
||||
供销综合云市场 <text></text>
|
||||
</view>
|
||||
<view class="selected-li">
|
||||
供销综合云商品 <text> <u--image style="margin-left: 40rpx;" :showLoading="true"
|
||||
src="/static/images/GXSC/XZ.png" width="24.53rpx" height="24.53rpx"></u--image>
|
||||
</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
|
||||
|
||||
@ -80,7 +42,7 @@
|
||||
<u--image :showLoading="true" src="/static/images/LHYC/FH.png" width="50.82rpx"
|
||||
height="50.82rpx" @click='goBack'></u--image>
|
||||
</view>
|
||||
<view class="" style="font-size: 40rpx;transform: skewX(-10deg);">
|
||||
<view class="" style="font-size: 40rpx;transform: skewX(-10deg);font-weight: 700;">
|
||||
供销综合云市场
|
||||
</view>
|
||||
</view>
|
||||
@ -285,8 +247,17 @@
|
||||
</view>
|
||||
|
||||
</view>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<view class="empty" style="" v-if="cloudList.length<=0">
|
||||
|
||||
<view style="height: var(--status-bar-height);"></view>
|
||||
|
||||
|
||||
<view style="padding: 10rpx;">
|
||||
|
||||
<view class="info">
|
||||
@ -298,16 +269,21 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
|
||||
<!-- 多规格购物车 -->
|
||||
|
||||
|
||||
|
||||
<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse">
|
||||
</authorize>
|
||||
<view class="" :style="`height:${appInfo.bottom}px;background-color:white`">
|
||||
<view class="" :style="`height:${appInfo.bottom}px;`">
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<view class="">
|
||||
<u-picker :defaultIndex="defaInd" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
|
||||
@cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
|
||||
@ -549,7 +525,11 @@
|
||||
},
|
||||
onPageScroll(e) {
|
||||
let that = this
|
||||
// if (e.scrollTop > 0) {
|
||||
this.showtit = !Boolean(e.scrollTop)
|
||||
// }
|
||||
// console.log(e)
|
||||
|
||||
uni.createSelectorQuery()
|
||||
.in(this)
|
||||
.select('.content')
|
||||
@ -786,7 +766,7 @@
|
||||
|
||||
},
|
||||
navgo(url) {
|
||||
uni.navigateTo({
|
||||
uni.redirectTo({
|
||||
url
|
||||
})
|
||||
},
|
||||
|
@ -4,70 +4,88 @@
|
||||
<view class='productList' :style="viewColor">
|
||||
<!-- 顶部 -->
|
||||
<view class="top">
|
||||
<view style="height: 10px;">
|
||||
|
||||
</view>
|
||||
|
||||
|
||||
<view class="head_tit">
|
||||
<view class="" style="display: flex;align-items: center;">
|
||||
<view class="back" @click='backjJump()' style="margin-right: 17rpx;">
|
||||
<view class="iconfont icon-xiangzuo" style="color: #333333;"></view>
|
||||
</view>
|
||||
<view class="" style="font-size: 40rpx;">
|
||||
<u--image :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx"
|
||||
height="50.82rpx" @click='backjJump'></u--image>
|
||||
<view class=""
|
||||
style="font-size: 36.8rpx;font-weight: 700;transform: skewX(-10deg);margin-left: 20rpx;color: #F84221;">
|
||||
供销综合云市场
|
||||
</view>
|
||||
<view style="margin-left: 20rpx;transition: 0.3s;" @click="showSelect=!showSelect"
|
||||
<view class=""
|
||||
@click="navGoto(`/pages/nongKe/cloud_entrepot/indexa?street=${street_id}&town=${street}`)"
|
||||
style="font-size: 36.8rpx;font-weight: 700;transform: skewX(-10deg);margin-left: 60rpx;">
|
||||
供销综合云商品
|
||||
</view>
|
||||
<!-- <view style="margin-left: 20rpx;transition: 0.3s;" @click="showSelect=!showSelect"
|
||||
:class="{selects:showSelect}">
|
||||
<u--image :showLoading="true" src="/static/images/GXSC/XL.png" width="33.29rpx"
|
||||
height="33.29rpx"></u--image>
|
||||
</view>
|
||||
</view> -->
|
||||
</view>
|
||||
<view class="">
|
||||
|
||||
</view>
|
||||
<!-- 搜索框 -->
|
||||
<view style="position: relative;width: 289.14rpx;" v-if="showSerch">
|
||||
<!-- <view style="position: relative;width: 289.14rpx;" v-if="showSerch">
|
||||
<u-search borderColor="#FF6D20" bgColor="white" @change="test" :showAction="false"
|
||||
placeholder="请输入..." v-model="sotreParam.keyword" @search="onInputConfirm"
|
||||
class="serch_cls"></u-search>
|
||||
<u--image @tap="searchSubmit" class="img_cls" :showLoading="true"
|
||||
src="/static/images/GXSC/SSBT.png" width="115.65rpx" height="56.82rpx"></u--image>
|
||||
</view>
|
||||
</view> -->
|
||||
<!-- 位置 -->
|
||||
<view v-else style="display: flex;align-items: center;" @click="showPicker=!showPicker">
|
||||
<!-- <view v-else style="display: flex;align-items: center;">
|
||||
<u--image @tap="showSerch=!showSerch" style="margin-right: 30rpx;" :showLoading="true"
|
||||
src="/static/images/GXSC/SS.png" width="49rpx" height="49rpx"></u--image>
|
||||
<u--image @click="showPicker=!showPicker" :showLoading="true" src="/static/images/GXSC/DW1.png"
|
||||
width="50.82rpx" height="50.82rpx"></u--image>
|
||||
<view class="town_name">{{street}}</view>
|
||||
</view> -->
|
||||
</view>
|
||||
|
||||
<view class="sswz">
|
||||
<view style="position: relative;width: 501.17rpx;">
|
||||
<u-search borderColor="#FF6D20" bgColor="white" @change="test" :showAction="false"
|
||||
placeholder="搜索店铺或者名称" v-model="sotreParam.keyword" @search="onInputConfirm"
|
||||
class="serch_cls"></u-search>
|
||||
<u--image @tap="searchSubmit" class="img_cls" :showLoading="true"
|
||||
src="/static/images/GXSC/SSBT.png" width="115.65rpx" height="56.82rpx"></u--image>
|
||||
</view>
|
||||
<view style="display: flex;align-items: center;" @click="showPicker=!showPicker">
|
||||
<u--image :showLoading="true" src="/static/images/GXSC/DW1.png" width="50.82rpx"
|
||||
height="50.82rpx"></u--image>
|
||||
<view class="town_name">{{street}}</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="selected-list" :class="{actSel:showSelect}">
|
||||
<!-- <view class="selected-list" :class="{actSel:showSelect}">
|
||||
<div class="triangle-up"></div>
|
||||
<view class="selected-li">
|
||||
供销综合云市场 <text> <u--image style="margin-left: 40rpx;" :showLoading="true"
|
||||
src="/static/images/GXSC/XZ.png" width="24.53rpx" height="24.53rpx"></u--image> </text>
|
||||
</view>
|
||||
<view class=""
|
||||
@click="navGoto(`/pages/nongKe/cloud_entrepot/index?street=${street_id}&town=${street}`)">
|
||||
@click="navGoto(`/pages/nongKe/cloud_entrepot/indexa?street=${street_id}&town=${street}`)">
|
||||
供销综合云商品
|
||||
</view>
|
||||
</view> -->
|
||||
|
||||
<view class="flags">
|
||||
|
||||
</view>
|
||||
|
||||
|
||||
|
||||
</view>
|
||||
|
||||
|
||||
<view class="content">
|
||||
<view style="height: 10px">
|
||||
<view class="" :style="`height:${headTop}px`">
|
||||
|
||||
</view>
|
||||
<view class="hot_serch">
|
||||
<text>热搜:</text>
|
||||
<!-- <text>热搜:</text>
|
||||
<text @click="hotSerchFn('小张副食')">小张副食</text>
|
||||
<text @click="hotSerchFn('正新酒店')">正新酒店</text>
|
||||
<text @click="hotSerchFn('麻辣鸡')">麻辣鸡</text>
|
||||
<text @click="hotSerchFn('手撕椒麻鸡')">手撕椒麻鸡</text>
|
||||
<text @click="hotSerchFn('手撕椒麻鸡')">手撕椒麻鸡</text> -->
|
||||
</view>
|
||||
|
||||
<view class="menu_cls">
|
||||
@ -356,6 +374,7 @@
|
||||
defaInd: [0, 0],
|
||||
columnData: [],
|
||||
showSerch: false,
|
||||
headTop: 0,
|
||||
imgList: [
|
||||
"/static/images/GXSC/BBY.png",
|
||||
"/static/images/GXSC/NYSC.png",
|
||||
@ -473,6 +492,19 @@
|
||||
this.menuList = res.data
|
||||
})
|
||||
this.Area()
|
||||
let that = this
|
||||
setTimeout(() => {
|
||||
uni.createSelectorQuery()
|
||||
.in(this)
|
||||
.select('.flags')
|
||||
.boundingClientRect(rect => {
|
||||
// console.log(this.cartTagInfo, 6666)
|
||||
// that.cartTagInfo = rect
|
||||
that.headTop = rect.top
|
||||
console.log(that.headTop)
|
||||
})
|
||||
.exec();
|
||||
}, 100)
|
||||
},
|
||||
computed: {
|
||||
downMenus: function() {
|
||||
@ -531,7 +563,7 @@
|
||||
city_code: 510500
|
||||
}).then(res => {
|
||||
this.$refs.uPicker.setColumnValues(0, res.data);
|
||||
// this.Street(res.data[0]['code']);
|
||||
this.Street(res.data[0]['code']);
|
||||
// console.log(res.data, 66666)
|
||||
});
|
||||
},
|
||||
@ -587,10 +619,10 @@
|
||||
},
|
||||
|
||||
test() {
|
||||
if (this.sotreParam.keyword.length > 3) {
|
||||
this.sotreParam.keyword.slice(0, 3)
|
||||
this.sotreParam.keyword = this.sotreParam.keyword.slice(0, 3) + "..."
|
||||
}
|
||||
// if (this.sotreParam.keyword.length > 3) {
|
||||
// this.sotreParam.keyword.slice(0, 3)
|
||||
// this.sotreParam.keyword = this.sotreParam.keyword.slice(0, 3) + "..."
|
||||
// }
|
||||
// console.log(this.sotreParam.keyword.length)
|
||||
},
|
||||
hotSerchFn(keywords) {
|
||||
@ -933,6 +965,7 @@
|
||||
align-items: center;
|
||||
box-sizing: border-box;
|
||||
padding: 0 20rpx;
|
||||
|
||||
}
|
||||
|
||||
.productList {
|
||||
@ -941,9 +974,7 @@
|
||||
|
||||
.top {
|
||||
padding-top: var(--status-bar-height);
|
||||
/* #ifdef H5 */
|
||||
padding-top: 30rpx;
|
||||
/* #endif */
|
||||
|
||||
// padding-top: 80rpx;
|
||||
background-color: #F0F2F5;
|
||||
position: fixed;
|
||||
@ -954,6 +985,7 @@
|
||||
|
||||
.content {
|
||||
padding: 20rpx;
|
||||
padding-top: 0;
|
||||
}
|
||||
|
||||
.menu_cls {
|
||||
@ -1066,24 +1098,7 @@
|
||||
}
|
||||
|
||||
.hot_serch {
|
||||
color: #B3B3B3;
|
||||
display: flex;
|
||||
justify-content: space-around;
|
||||
margin-top: 40rpx;
|
||||
|
||||
flex-wrap: wrap;
|
||||
// margin-top: 50rpx;
|
||||
// padding-top: 100rpx;
|
||||
padding-top: var(--status-bar-height);
|
||||
// margin-top: 10px;
|
||||
/* #ifdef H5 */
|
||||
padding-top: 50rpx;
|
||||
/* #endif */
|
||||
// margin-top: 200rpx;
|
||||
|
||||
text {
|
||||
margin: 10rpx;
|
||||
}
|
||||
height: 20rpx;
|
||||
}
|
||||
|
||||
.productList .search .input {
|
||||
@ -1577,4 +1592,12 @@
|
||||
.pop {
|
||||
z-index: 1;
|
||||
}
|
||||
|
||||
.sswz {
|
||||
margin-top: 30rpx;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
box-sizing: border-box;
|
||||
padding: 0 20rpx;
|
||||
}
|
||||
</style>
|
@ -15,7 +15,8 @@
|
||||
<view class="back" @click='backjJump()' style="margin-right: 17rpx;">
|
||||
<view class="iconfont icon-xiangzuo" style="color: #333333;"></view>
|
||||
</view>
|
||||
<view class="" style="font-size: 40rpx;">
|
||||
<view class=""
|
||||
style="font-size: 36.8rpx;font-weight: 700;transform: skewX(-10deg);margin-left: 20rpx;">
|
||||
{{titName}}
|
||||
</view>
|
||||
</view>
|
||||
|
@ -182,7 +182,7 @@
|
||||
</view>
|
||||
</form>
|
||||
<view class="settlementAgreement" v-if="showProtocol">
|
||||
<view class="setAgCount">
|
||||
<view class="setAgCount" style="width: 656rpx;height: 458px;">
|
||||
<i class="icon iconfont icon-cha" @click="showProtocol = false"></i>
|
||||
<div class="title">{{isType ? '店铺类型说明' : '商户入驻协议'}}</div>
|
||||
<view class="content">
|
||||
@ -194,6 +194,10 @@
|
||||
<view class="settlementAgreement" v-if="isshow">
|
||||
<view class="setAgCount" style="width: 100%;height: 100%;">
|
||||
<!-- <i class="icon iconfont icon-cha" @click="recuo"></i> -->
|
||||
<view class="" style="width: 60rpx;height: 60rpx; position: absolute;right: 30rpx; top:20rpx" @click="recuo">
|
||||
<image src="@/static/images/close.png" mode="aspectFit" style="width: 60rpx;height: 60rpx;"></image>
|
||||
</view>
|
||||
|
||||
<div class="title">{{detail.title}}</div>
|
||||
<view style="margin: 20rpx 0;">甲方公司:{{company?company:"暂无公司信息"}}</view>
|
||||
<view style="margin: 20rpx 0;">机构代码:{{organization_code?organization_code:"暂无公司信息"}}</view>
|
||||
@ -1303,25 +1307,25 @@
|
||||
}
|
||||
|
||||
.settlementAgreement .setAgCount .content {
|
||||
margin-top: 32rpx;
|
||||
|
||||
color: #333;
|
||||
font-size: 26rpx;
|
||||
line-height: 22px;
|
||||
text-align: justify;
|
||||
text-justify: distribute-all-lines;
|
||||
height: 756rpx;
|
||||
|
||||
overflow-y: scroll;
|
||||
}
|
||||
|
||||
|
||||
.settlementAgreement .setAgCount .contenta {
|
||||
margin-top: 32rpx;
|
||||
|
||||
color: #333;
|
||||
font-size: 26rpx;
|
||||
line-height: 22px;
|
||||
text-align: justify;
|
||||
text-justify: distribute-all-lines;
|
||||
height: 1000rpx;
|
||||
height: 75%;
|
||||
overflow-y: scroll;
|
||||
|
||||
|
||||
|
BIN
static/images/LHYC/DWBG.png
Normal file
After Width: | Height: | Size: 3.6 KiB |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 5.4 KiB |
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 5.1 KiB |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 5.4 KiB |
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 5.0 KiB |
Before Width: | Height: | Size: 6.0 KiB |
@ -9,6 +9,7 @@
|
||||
// +----------------------------------------------------------------------
|
||||
import {
|
||||
HTTP_REQUEST_URL,
|
||||
HTTP_REQUEST_URL_FOUR,
|
||||
HEADER,
|
||||
TOKENNAME
|
||||
} from '@/config/app';
|
||||
@ -18,6 +19,7 @@ import {
|
||||
import store from '../store';
|
||||
|
||||
|
||||
console.log(HTTP_REQUEST_URL_FOUR)
|
||||
|
||||
/**
|
||||
* 发送请求
|
||||
@ -27,7 +29,7 @@ function baseRequest(url, method, data, {
|
||||
noVerify = false
|
||||
}) {
|
||||
|
||||
let Url = 'https://preview-worker-task.lihaink.cn',
|
||||
let Url = HTTP_REQUEST_URL_FOUR,
|
||||
header = HEADER;
|
||||
|
||||
|
||||
@ -58,7 +60,6 @@ function baseRequest(url, method, data, {
|
||||
})
|
||||
reject(res.data);
|
||||
} else if (res.statusCode==200) {
|
||||
console.log(res)
|
||||
reslove(res.data,res.data);
|
||||
} else
|
||||
reject(res.data.message || '系统错误');
|
||||
|