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

生产 以及注销功能功能放出

Browse Source
This commit is contained in:
jia 2023-09-26 08:52:29 +08:00
parent c225f36309
commit 552d97ce16
11 changed files with 162 additions and 93 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);
}

34
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) {
@ -33,37 +33,7 @@ switch (env) {
}
// // 网络接口修改此字符 小程序域名要求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'

4
manifest.json
View File

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

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;

75
pages/moreProject/moreProject.vue
View File

@ -443,7 +443,7 @@
<image src="@/static/images/close.png" mode=""></image>
</view>
<form report-submit='true' style="height: 90%;">
<form report-submit='true' style="height: 90%;">
<view class='merchantsSettled' :style="{'height':Fheight}">
<view class="title">填写信息</view>
<view class='list'>
@ -605,7 +605,7 @@
cardno_front: '',
cardno_back: ''
},
Fheight:0,
Fheight: 0,
};
},
@ -614,7 +614,7 @@
},
created() {},
onLoad() {
this.Fheight = uni.getSystemInfoSync().windowHeight+'px';
this.Fheight = uni.getSystemInfoSync().windowHeight + 'px';
console.log(this.Fheight)
},
onShow() {
@ -628,6 +628,9 @@
this.getUserInfo()
this.codelist()
this.list()
},
@ -684,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() {
@ -847,9 +832,23 @@
//保证金缴纳
margin(url) {
if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) {
this.isFshow = true
this.countDown()
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
})
@ -863,10 +862,27 @@
})
},
navigator(url, t) {
if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) {
this.isFshow = true
this.countDown()
// 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
})
@ -881,9 +897,9 @@
street_code: res.data.mer_info.street_id
}).then((res) => {
if (res.code == 0) {
this.$util.Tips({
title: res.msg
});
// this.$util.Tips({
// title: res.msg
// });
return false;
}
this.company = res.data.title
@ -983,6 +999,7 @@
.item-card {
display: flex;
margin-top: 20rpx;
.item-carda {
width: 298rpx;
height: 175rpx;
@ -1138,7 +1155,7 @@
width: 588rpx;
margin: 0 auto;
height: 86rpx;
border-radius: 25px;
text-align: center;
line-height: 86rpx;

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="">
温馨提示：初始密码默认为手机号后六位，请初次登录后及时修改

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

@ -194,10 +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">
<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>
@ -289,7 +290,7 @@
data() {
return {
company: '',
organization_code:'',
organization_code: '',
domain: HTTP_REQUEST_URL,
cartId: '', //购物车id
pinkId: 0, //拼团id
@ -384,7 +385,7 @@
this.shoplist()
},
onShow() {
},
onReady() {},
methods: {
@ -574,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)
})
},
@ -756,10 +757,11 @@
formSubmit: function(e) {
if (this.num == 0) {
let that = this;
if (that.validateForm() && that.validate) {
let that = this;
if (that.validateForm() && that.validate) {
if (this.num == 0) {
let requestData = {
phone: that.merchantData.phone,
mer_name: that.merchantData.enterprise_name,
@ -813,14 +815,15 @@
});
})
}
} else {
this.isshow = true
this.countDown()
}
} else {
this.isshow = true
this.countDown()
}
},
validateBtn: function() {
let that = this,
@ -1307,19 +1310,19 @@
}
.settlementAgreement .setAgCount .content {
color: #333;
font-size: 26rpx;
line-height: 22px;
text-align: justify;
text-justify: distribute-all-lines;
overflow-y: scroll;
}
.settlementAgreement .setAgCount .contenta {
color: #333;
font-size: 26rpx;
line-height: 22px;

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>

2
store/modules/app.js
View File

@ -125,7 +125,7 @@ const actions = {
phone_brand:os.brand
}).then((res) => {
if (Object.keys(res.data.appInfo).length > 0) {
// if(res.data.appInfo.version) uni.showLoading({
// title: '检查更新中'

4
utils/requestb.js
View File

@ -19,7 +19,7 @@ import {
import store from '../store';
console.log(HTTP_REQUEST_URL_FOUR)
// console.log(HTTP_REQUEST_URL_FOUR)
/**
* 发送请求
@ -46,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)