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

Merge remote-tracking branch 'remotes/origin/old'

Browse Source
This commit is contained in:
jia 2023-09-26 08:55:36 +08:00
commit 232f7710bd
32 changed files with 1369 additions and 672 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/api.js
View File

@ -305,3 +305,8 @@ export function paymerchant() {
export function merchant(data) {
return request.get(`store/merchant/margin`, data);
}
//获取保证金缴纳列表
export function marginlist(data) {
return request.get(`user/margin/list`,data);
}

41
config/app.js
View File

@ -8,8 +8,8 @@ let httpApiTwo
let httpApiThree
// 在打包之前请检查当前环境是否正确
const env = 'dev'; // 开发
// const env = 'prod'; // 生产
// const env = 'dev'; // 开发
const env = 'prod'; // 生产
// const env = 'prew'; // 预上线
switch (env) {
@ -17,50 +17,23 @@ switch (env) {
httpApi = 'https://shop.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'
httpApiFour = 'https://preview-worker-task.lihaink.cn'
break;
default:
httpApi = "https://crmeb-test.shop.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'
}
// // 网络接口修改此字符 小程序域名要求https
// // let httpApi = 'http://192.168.31.110:8324' // 测试
// 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"
// // httpApi = 'http://192.168.0.108:8325'
// // #ifdef MP-WEIXIN
// httpApiTwo = "https://nk.lihaink.cn"
// httpApiThree = 'http://ceshi-oa.lihaink.cn'
// // #endif
// // #ifdef H5
// // 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' // 生产
// // httpApi ='https://test.shop.lihaink.cn' //预发布环境
// // httpApi = "https://crmeb-test.shop.lihaink.cn"
// httpApiTwo = 'https://nk.lihaink.cn' // 生产
// httpApiThree = 'http://ceshi-oa.lihaink.cn' //生产
// }
// httpApi = 'https://shop.lihaink.cn' // 生产
// httpApiTwo = 'https://nk.lihaink.cn' // 生产
// 聊天接口修改此字符 小程序聊天要求wss 例如：wss://mer.crmeb.net
// let wsApi = 'ws://192.168.3.20:8324'
@ -73,11 +46,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,
// 聊天长连接地址

4
manifest.json
View File

@ -2,8 +2,8 @@
"name" : "惠农生活",
"appid" : "__UNI__3A527D1",
"description" : "",
"versionName" : "1.4.1",
"versionCode" : 141,
"versionName" : "1.4.4",
"versionCode" : 144,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {

2
pages.json
View File

@ -124,7 +124,7 @@
}, {
"path": "pages/moreProject/moreProject",
"style": {
"navigationBarTitleText": "更多功能",
"navigationBarTitleText": "商户平台",
"enablePullDownRefresh": false
}

22
pages/gather/gather.vue
View File

@ -141,7 +141,6 @@
},
prefix: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/11/',
isShow: false,
isFshow: false,
street: '',
// 编辑中标记
@ -159,6 +158,15 @@
data: '__UNI__B5B1EDD',
type: 1,
},
{
name: '农业咨询',
icon: '/static/applet/ny.png',
data: {
id: '__UNI__9620511',
url: '/static/wgt/__UNI__9620511.wgt',
},
type: 1,
}
],
nowMenuList: [],
street: '',
@ -225,9 +233,7 @@
} else if (scrollTop > 100) {
this.backColor = 'rgba(252, 252, 252, 1)'
this.isFshow = true
}
},
// #endif
@ -291,7 +297,6 @@
this.getUniMp(data);
break;
case 2:
this.navigator(data);
break;
}
@ -315,10 +320,13 @@
this.editFlag = false;
uni.setStorageSync('gatherNowMenuList', JSON.stringify(this.nowMenuList));
},
getUniMp(appid) {
console.log('点击供销平台');
getUniMp(data) {
// #ifdef APP-PLUS
uniMP.loadMP(appid);
console.log(data, typeof data == 'string');
if(typeof data == 'string') uniMP.loadMP(data);
else uniMP.loadMPurl(data);
// uniMP.loadMPurl(data);
// uniMP.open(data.id);
return;
// #endif
uni.showToast({

78
pages/margin/margin.vue
View File

@ -6,7 +6,7 @@
<view class="title">店铺保证金信息</view>
<view class="item">
<text>已缴纳保证金</text>
<text>{{merchant_Data.margin}}</text>
<text>{{merchant_Data.paid_margin}}</text>
</view>
<view class="item">
<text>缴纳店铺账户</text>
@ -17,7 +17,7 @@
<view class="price">
<view class="title">缴纳金额</view>
<view class="tab">
<view class="item active" style="margin: 0;">{{merchant_Data.recharge_margin}}元</view>
<view class="item active" style="margin: 0;">{{merchant_Data.margin}}元</view>
</view>
<button class="btn" @click="paydecimal">缴纳</button>
</view>
@ -26,27 +26,82 @@
<view class="text">充值后帐户的金额不能提现，可用于商城消费使用佣金导入账户之后不能再次导出、不可提现账户充值出现问题可联系商城客服，也可拨打商城客服热线<text @click="copyPhone('4008888888')">4008888888</text>
</view>
</view> -->
<view class="content-order" v-for="(item,i ) in productList">
<view class="">订单编号：{{item.order_sn}}</view>
<view class="">支付金额：{{item.total_price}}</view>
<view class="">支付状态：{{item.pay_type==1?'已支付':'待支付'}}</view>
<view class="">支付时间：{{item.pay_time}}</view>
</view>
<view class='loadingicon acea-row row-center-wrapper' v-if='productList.length > 0'>
<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
</view>
</view>
</template>
<script>
import {
merchant,
paymerchant
paymerchant,
marginlist
} from '@/api/api.js'
export default {
data() {
return {
mer_id:0,
merchant_Data: {},
where:{
page:1,
limit:10
},
productList:[],
loadend: false,
loading: false,
loadTitle: '加载更多',
}
},
onLoad(e) {
this.mer_id = e.mer_id
this.decimal()
this.list(false)
},
onReachBottom() {
if (this.productList.length > 0) {
setTimeout(() => {
this.list(false);
}, 1000)
}
},
methods: {
list(isPage){
let that = this;
if (that.loadend) return;
if (that.loading) return;
if (isPage === true) that.$set(that, 'productList', []);
that.loading = true;
that.loadTitle = '';
marginlist(that.where).then(res => {
let list = res.data.list;
let productList = that.$util.SplitArray(list, that.productList);
let loadend = list.length < that.where.limit;
that.loadend = loadend;
that.loading = false;
that.loadTitle = loadend ? '已全部加载' : '加载更多';
setTimeout(() => {
that.$set(that, 'productList', productList);
}, 500)
// console.log(that.productList)
that.$set(that.where, 'page', that.where.page + 1);
if (that.where.page == 1 && res.data.list.length <= 0) that.emptyShow = true
}).catch(err => {
that.loading = false;
that.loadTitle = '加载更多';
});
},
//获取保证金信息
decimal() {
merchant({
@ -105,7 +160,24 @@
page {
background-color: #fff;
}
.content-order{
background: #F4F4F4;
border-radius: 21rpx 21rpx ;
margin-top: 30rpx;
padding: 10rpx;
margin-left: 10rpx;
margin-right: 10rpx;
view{
font-size: 30rpx;
font-family: PingFang SC-Regular, PingFang SC;
font-weight: 400;
color: #333333;
margin: 20rpx;
}
}
.info {
display: flex;
flex-direction: column;

131
pages/moreProject/moreProject.vue
View File

@ -302,6 +302,7 @@
</image>
<text class="text">商户设置</text>
</view>
<view class="examine" @click="navigator(`/pages/margin/margin`)">
<image class="icon_img" src="@/static/images/jy.png">
</image>
@ -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 = '暂无可用应用'
@ -626,6 +630,7 @@
this.list()
},
@ -682,24 +687,6 @@
this.$refs.popup.open()
this.isFshow = false
// intentionbus({
// "status": 1
// }).then((res) => {
// if (res.status == 200) {
// this.$util.Tips({
// title: res.message,
// icon: 'success',
// })
// this.getUserInfo()
// this.isFshow = false
// }
// }).catch((err) => {
// this.isFshow = false
// this.$util.Tips({
// title: err,
// icon: 'error',
// })
// })
},
//拒绝
refuse() {
@ -842,10 +829,31 @@
}
},
//保证金缴纳
margin(url) {
uni.navigateTo({
url: url+`?mer_id=` + this.mer_id
if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) {
if (this.codenote.length == 0) {
this.isFshow = true
this.countDown()
} else {
if (this.codenote[0].status == 0) {
uni.showModal({
title: '申请正在审核中，请勿重复提交'
})
} else {
this.isFshow = true
this.countDown()
}
}
} else {
uni.navigateTo({
url: url + `?mer_id=` + this.mer_id
})
}
},
//商户设置
buyserset() {
@ -854,10 +862,27 @@
})
},
navigator(url, t) {
if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) {
// console.log(this.codenote)
if (this.codenote.length == 0) {
this.isFshow = true
this.countDown()
} else {
if (this.codenote[0].status == 0) {
uni.showModal({
title: '申请正在审核中，请勿重复提交'
})
} else {
this.isFshow = true
this.countDown()
}
}
} else {
uni.navigateTo({
url: url
})
@ -871,15 +896,15 @@
merstreet({
street_code: res.data.mer_info.street_id
}).then((res) => {
if(res.code==0){
this.$util.Tips({
title: res.msg
});
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=>{
this.company = res.data.title
this.organization_code = res.data.organization_code
}).catch(res => {
console.log(res)
})
if (res.data.service == null) {
@ -916,8 +941,8 @@
.userpage {
width: 100%;
height: 1368rpx;
padding-top: 150rpx;
background-color: #fff;
position: relative;
}
@ -926,7 +951,7 @@
width: 60rpx;
height: 60rpx;
position: absolute;
top: 60rpx;
top: 65rpx;
right: 60rpx;
image {
@ -940,7 +965,8 @@
}
.merchantsSettled {
height: 1368rpx;
height: 100%;
padding-top: 80rpx;
}
.merchantsSettled .title {
@ -953,12 +979,8 @@
.merchantsSettled .list {
background-color: #fff;
border-radius: 12px;
margin: 0 15px;
position: absolute;
width: calc(100% - 30px);
}
.application-record {
@ -1133,6 +1155,7 @@
width: 588rpx;
margin: 0 auto;
height: 86rpx;
border-radius: 25px;
text-align: center;
line-height: 86rpx;
@ -1203,27 +1226,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;

76
pages/nongKe/cloud_entrepot/index.vue
View File

@ -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
})
},

1158
pages/nongKe/cloud_entrepot/indexa.vue
View File

File diff suppressed because it is too large Load Diff

117
pages/nongKe/supply_chain/supplier.vue
View File

@ -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>
<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>

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

@ -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>

6
pages/product/basicSet.vue
View File

@ -7,8 +7,10 @@
<view class="store_bg">
<view class="text flex_a_c"><i class="iconfont icon-xinghao"></i>上传店铺背景图</view>
<block v-if="images[0].img">
<u--image :showLoading="true" :src="images[0].img" width="388px" height="210.53rpx" radius="4px"
@click="delImg(0)" mode="aspectFit"></u--image>
<!-- <u--image :showLoading="true" :src="images[0].img" width="388px" height="210.53rpx" radius="4px"
@click="delImg(0)" mode="aspectFit"></u--image> -->
<u--image :showLoading="true" :src="images[0].img" width="360px" height="210.53rpx" radius="4px"
@click="delImg(2)"></u--image>
</block>
<view v-else class="upload" @click="seleckImage(0)">
<view class="iconfont icon-tupian1"></view>

4
pages/store/merchantDetails/index.vue
View File

@ -6,7 +6,7 @@
恭喜，您的申请已通过！
</view>
</view>
<view class="msg" v-if="mer_id > 0 && resData.login_url">
<!-- <view class="msg" v-if="mer_id > 0 && resData.login_url">
<view class="url">
<text class="head">登录地址：</text>
<text class="content">{{resData.login_url}}</text>
@ -18,7 +18,7 @@
</view>
<text class="cope" @click="copyTBL()">复制</text>
</view>
</view>
</view> -->
<view class="btn" v-if="mer_id > 0">
<view class="">
温馨提示：初始密码默认为手机号后六位，请初次登录后及时修改

35
pages/store/settled/index.vue
View File

@ -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,11 @@
<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>
@ -285,7 +290,7 @@
data() {
return {
company: '',
organization_code:'',
organization_code: '',
domain: HTTP_REQUEST_URL,
cartId: '', //购物车id
pinkId: 0, //拼团id
@ -570,15 +575,15 @@
merstreet({
street_code: this.street_id
}).then((res) => {
if(res.code==0){
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=>{
this.company = res.data.title
this.organization_code = res.data.organization_code
}).catch(res => {
console.log(res)
})
},
@ -752,10 +757,11 @@
formSubmit: function(e) {
if (this.num == 0) {
let that = this;
if (that.validateForm() && that.validate) {
if (this.num == 0) {
let requestData = {
phone: that.merchantData.phone,
mer_name: that.merchantData.enterprise_name,
@ -809,14 +815,15 @@
});
})
}
}
} else {
this.isshow = true
this.countDown()
}
}
},
validateBtn: function() {
let that = this,
@ -1303,25 +1310,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;

1
pages/user/index.vue
View File

@ -594,6 +594,7 @@
that.is_promoter = res.data.is_promoter;
that.extension_status = res.data.extension_status;
that.getMyMenus();
that.$store.commit('SET_USERINFO', that.userInfo);
});
},
// 订单数字

4
pages/users/user_info/index.vue
View File

@ -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/applet/fl.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.7 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.3 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
static/images/LHYC/DWBG.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
static/images/SFFF.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

BIN
static/images/SFZZ.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 5.1 KiB

BIN
static/images/YHKF.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

BIN
static/images/YHKZ.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

BIN
static/images/ti1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.0 KiB

BIN
static/wgt/__UNI__9620511.wgt Normal file
View File

Binary file not shown.

12
store/modules/app.js
View File

@ -4,12 +4,10 @@ import {
} from "../../api/user.js";
import {
LOGIN_STATUS,
UID
} from '../../config/cache';
import Cache from '../../utils/cache';
import {
UID,
USER_INFO
} from '../../config/cache';
import Cache from '../../utils/cache';
// #ifdef APP-PLUS
import Updater from '@/uni_modules/guyue-updater/index';
// #endif
@ -18,7 +16,7 @@ const state = {
location: Cache.get('LOCATION_DATA', true) || {},
token: Cache.get(LOGIN_STATUS) || null,
backgroundColor: "#fff",
userInfo: null,
userInfo: Cache.get(USER_INFO)||null,
uid: Cache.get(UID) || null,
globalData: uni.getStorageSync('GLOBAL_DATA') || {},
homeActive: false,
@ -39,6 +37,10 @@ const mutations = {
Cache.set(LOGIN_STATUS, opt.token, opt.time);
uni.removeStorageSync('auth_token');
},
SET_USERINFO(state, opt){
state.userInfo = opt;
Cache.set(USER_INFO, opt);
},
SETUID(state, val) {
state.uid = val;
Cache.set(UID, val);

7
utils/requestb.js
View File

@ -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;
@ -44,7 +46,7 @@ function baseRequest(url, method, data, {
// #ifdef APP-PLUS
// console.log('app', Url + '/api/' + url, res.data);
// #endif
console.log(res.data.code)
// console.log(res.data.code)
if (noVerify)
reslove(res.data, res);
else if (res.data.status == 200)
@ -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 || '系统错误');

23
utils/uniMP.js
View File

@ -5,6 +5,7 @@ import {
HTTP_REQUEST_URL
} from '@/config/app';
const mp = uni.requireNativePlugin('uniMP');
import store from "@/store/modules/app.js"
let appid = ''; // 应用id
let wgtFile = ''; // 应用文件地址
@ -84,6 +85,23 @@ const loadMP = async (id) => {
}
});
};
// 按URL加载小程序
const loadMPurl = async (e) => {
appid = e.id;
mp.getUniMPVersion(appid, (ret) => {
console.log('当前版本', ret);
wgtFile = e.url;
doInstallMP();
// if (0 != ret.code) {
// wgtFile = e.url;
// installMP();
// } else {
// open()
// }
});
};
// 小程序版本信息
const getVersion = (id) => {
appid = id;
@ -117,7 +135,7 @@ const doInstallMP = () => {
showCancel: false
});
}
console.log('初始化供销: ' + JSON.stringify(r));
console.log('初始化: ' + JSON.stringify(r));
});
};
@ -127,11 +145,13 @@ const open = (id = null) => {
icon: 'none',
title: '请先登录'
})
let avatar = store?.state?.userInfo?.avatar;
mp.openUniMP({
appid: id || appid,
extraData: {
uniMP: true,
token: token,
avatar: avatar,
}
}, (ret) => {
uni.hideLoading();
@ -148,6 +168,7 @@ const open = (id = null) => {
export default {
loadMP,
loadMPurl,
installMP,
doInstallMP,
getVersion,