mkm
/
shop-applet
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://gitea.lihaink.cn/mkm/shop-applet

This commit is contained in:
weipengfei 2024-03-08 18:06:19 +08:00
parent ed728f3a74 50e282896c
commit e1ac5d4947
2 changed files with 50 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
pages/nongKe/statistics/index.vue
View File

@ -1,6 +1,5 @@
<template> <template>
<view class="content"> <view class="content">
<view class="content-top"> <view class="content-top">
<view class="content-tops"> <view class="content-tops">
<view class="content-top_img" v-if="Object.keys(userInfoData).length>0"> <view class="content-top_img" v-if="Object.keys(userInfoData).length>0">
@ -101,7 +100,6 @@
:isGoIndex="false"></authorize> :isGoIndex="false"></authorize>
<view class="settlementAgreement" v-if="isFshow"> <view class="settlementAgreement" v-if="isFshow">
<view class="setAgCount" style="width: 100%;height: 100%; padding-top: 160rpx;"> <view class="setAgCount" style="width: 100%;height: 100%; padding-top: 160rpx;">
<!-- <i class="icon iconfont icon-cha" @click="recuo"></i> -->
<view class="" style="width: 90rpx;height: 90rpx; position: absolute;right: 10rpx; top:90rpx" <view class="" style="width: 90rpx;height: 90rpx; position: absolute;right: 10rpx; top:90rpx"
@click="recuo"> @click="recuo">
<image src="@/static/images/close.png" mode="aspectFit" style="width: 90rpx;height: 90rpx;"></image> <image src="@/static/images/close.png" mode="aspectFit" style="width: 90rpx;height: 90rpx;"></image>
@ -114,9 +112,6 @@
</view> </view>
<view class="setAgCountbtn"> <view class="setAgCountbtn">
<view class="border"></view> <view class="border"></view>
<!-- <button class="setAgCountbtna" @click="refuse">
拒绝
</button> -->
<button class="btn" :class="num>0?'setAgCountbtnb':'setAgCountbtnc'" :disabled="num!=0" <button class="btn" :class="num>0?'setAgCountbtnb':'setAgCountbtnc'" :disabled="num!=0"
@click="agree"> @click="agree">
@ -137,13 +132,6 @@
<view class='merchantsSettled' style="height:100vh;"> <view class='merchantsSettled' style="height:100vh;">
<view class="title">填写信息</view> <view class="title">填写信息</view>
<view class='list'> <view class='list'>
<!-- <view class="item">
<view class="acea-row row-middle">
<text class="item-name">联系电话:</text>
<input type="text" placeholder="请输入手机号" v-model="merchantData.phone" @input="validateBtn"
placeholder-class='placeholder' />
</view>
</view> -->
<view class="item" v-if="userInfoData.mer_info&&userInfoData.mer_info.is_company"> <view class="item" v-if="userInfoData.mer_info&&userInfoData.mer_info.is_company">
<view class="acea-row row-middle" style="display: flex;align-items: flex-start;"> <view class="acea-row row-middle" style="display: flex;align-items: flex-start;">
<text class="item-name" style="flex-shrink: 0;">公司名称:</text> <text class="item-name" style="flex-shrink: 0;">公司名称:</text>
@ -192,27 +180,7 @@
placeholder-class='placeholder' /> placeholder-class='placeholder' />
</view> </view>
</view> </view>
<!-- <view class="item">
<view class="acea-row row-middle">
<text class="item-name">身份证正面:</text>
</view>
<view class="item-card">
<view class="item-carda" @click='uploadpic({type:1})' v-if='merchantData.cardno_front.length==0'>
<image src="@/static/images/SFZZ.png" mode="aspectFit"></image>
</view>
<view class="item-carda" @click='DelPic({type:1})' v-else>
<image :src="merchantData.cardno_front" mode="aspectFit"></image>
</view>
<view class="item-cardb" @click='uploadpic({type:2})' v-if='merchantData.cardno_back.length==0'>
<image src="@/static/images/SFFF.png" mode="aspectFit"></image>
</view>
<view class="item-cardb" @click='DelPic({type:2})' v-else>
<image :src="merchantData.cardno_back" mode="aspectFit"></image>
</view>
</view>
</view> -->
<view class="item" v-if="userInfoData.mer_info && userInfoData.mer_info.is_company != 1"> <view class="item" v-if="userInfoData.mer_info && userInfoData.mer_info.is_company != 1">
<view class="acea-row row-middle"> <view class="acea-row row-middle">
<text <text
@ -228,16 +196,9 @@
<view class="item-carda" @click='DelPic({type:3})' v-else> <view class="item-carda" @click='DelPic({type:3})' v-else>
<image :src="merchantData.bank_front" mode="aspectFit"></image> <image :src="merchantData.bank_front" mode="aspectFit"></image>
</view> </view>
<!-- <view class="item-cardb" @click='uploadpic({type:4})' v-if='merchantData.bank_back.length==0'>
<image src="@/static/images/YHKF.png" mode="aspectFit"></image>
</view>
<view class="item-cardb" @click='DelPic({type:4})' v-else>
<image :src="merchantData.bank_back" mode="aspectFit"></image>
</view> -->
</view> </view>
</view> </view>
<button class='submitBtn' :class="validate === true? 'on':''" @click="formSubmit"> <button class='submitBtn' :class="validate === true? 'on':''" @click="formSubmit">
提交申请 提交申请
</button> </button>
@ -246,7 +207,6 @@
</form> </form>
</view> </view>
</uni-popup> </uni-popup>
<!-- <activePopup v-if="userInfoData.mer_info&&userInfoData.mer_info.type_id"></activePopup> -->
</view> </view>
</template> </template>
@ -254,9 +214,7 @@
import authorize from '@/components/Authorize'; import authorize from '@/components/Authorize';
import ordertime from '../../index/component/timelist.vue' import ordertime from '../../index/component/timelist.vue'
import retuntop from '@/components/content-top/index.vue'; import retuntop from '@/components/content-top/index.vue';
import activePopup from '@/components/activePopup.vue';
import { import {
setAdminOrderRemark setAdminOrderRemark
} from "@/api/admin"; } from "@/api/admin";
import { import {
@ -274,7 +232,6 @@
orderStatistics, orderStatistics,
otherOrderStatistics, otherOrderStatistics,
getOrderList getOrderList
} from "@/api/admin"; } from "@/api/admin";
import { import {
ENV ENV
@ -288,7 +245,6 @@
authorize, authorize,
ordertime, ordertime,
retuntop, retuntop,
activePopup
}, },
data() { data() {
return { return {
@ -906,6 +862,7 @@
url: '/pages/users/login/login_copy' url: '/pages/users/login/login_copy'
}) })
}, },
//获取协议内容 //获取协议内容
list1() { list1() {
business({ business({
@ -914,6 +871,7 @@
this.detail = res.data this.detail = res.data
}) })
}, },
//跳转 //跳转
shopp() { shopp() {
if (this.userInfoData.mer_info.type_id == 12) { if (this.userInfoData.mer_info.type_id == 12) {
@ -924,7 +882,6 @@
uni.navigateTo({ uni.navigateTo({
url: `/pages/store/home/index?id=` + this.userInfoData.service.mer_id + `&type=7` url: `/pages/store/home/index?id=` + this.userInfoData.service.mer_id + `&type=7`
}) })
} }
}, },
//界面跳转 //界面跳转
@ -939,32 +896,26 @@
const data = { const data = {
product_type: this.where1.product_type product_type: this.where1.product_type
} }
orderStatistics(this.userInfoData.service.mer_id, data).then( orderStatistics(this.userInfoData.service.mer_id, data).then(res => {
res => {
this.order[0].value = res.data.order.unpaid this.order[0].value = res.data.order.unpaid
this.order[1].value = res.data.order.unshipped this.order[1].value = res.data.order.unshipped
this.order[2].value = res.data.order.untake this.order[2].value = res.data.order.untake
this.order[3].value = res.data.order.unevaluate this.order[3].value = res.data.order.unevaluate
this.order[4].value = res.data.order.refund this.order[4].value = res.data.order.refund
this.list[2].value = res.data.data.month.orderNum this.list[2].value = res.data.data.month.orderNum
}, }, err => {
err => {
that.$util.Tips({ that.$util.Tips({
title: err.msg title: err.msg
}) })
} });
); otherOrderStatistics(this.userInfoData.service.mer_id, data).then(res => {
otherOrderStatistics(this.userInfoData.service.mer_id, data).then(
res => {
this.other_order[0].value = res.data.order.unshipped this.other_order[0].value = res.data.order.unshipped
this.other_order[1].value = res.data.order.untake this.other_order[1].value = res.data.order.untake
}, }, err => {
err => {
that.$util.Tips({ that.$util.Tips({
title: err.msg title: err.msg
}) })
} });
);
}, },
open() { open() {
this.isshow = !this.isshow this.isshow = !this.isshow
@ -1050,8 +1001,7 @@
} }
setAdminOrderRemark(that.userInfoData.service.mer_id, that.refundInfo.order_id, { setAdminOrderRemark(that.userInfoData.service.mer_id, that.refundInfo.order_id, {
remark: that.refundInfo.remark remark: that.refundInfo.remark
}).then( }).then(res => {
res => {
this.refundMark = false; this.refundMark = false;
this.$util.Tips({ this.$util.Tips({
@ -1059,14 +1009,12 @@
icon: 'success' icon: 'success'
}) })
that.getGoods(true); that.getGoods(true);
}, }, err => {
err => {
that.$util.Tips({ that.$util.Tips({
title: err title: err
}); });
} });
);
}, },
// 授权关闭 // 授权关闭
authColse: function(e) { authColse: function(e) {
@ -1264,7 +1212,6 @@
<style lang="scss" scoped> <style lang="scss" scoped>
page { page {
background-color: #f4f7fe; background-color: #f4f7fe;
// background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%);
} }
/deep/.statistical-page .navs { /deep/.statistical-page .navs {
@ -1438,7 +1385,6 @@
.merchantsSettled .list .item { .merchantsSettled .list .item {
padding: 30rpx 0 10rpx; padding: 30rpx 0 10rpx;
position: relative; position: relative;
margin: 0 20px; margin: 0 20px;
@ -1573,7 +1519,6 @@
width: 588rpx; width: 588rpx;
margin: 0 auto; margin: 0 auto;
height: 86rpx; height: 86rpx;
border-radius: 25px; border-radius: 25px;
text-align: center; text-align: center;
line-height: 86rpx; line-height: 86rpx;
@ -1590,7 +1535,6 @@
pointer-events: all; pointer-events: all;
} }
.settlementAgreement { .settlementAgreement {
width: 100vw; width: 100vw;
height: 100vh; height: 100vh;
@ -1604,7 +1548,6 @@
.settlementAgreement .setAgCount { .settlementAgreement .setAgCount {
background: #fff; background: #fff;
width: 694rpx; width: 694rpx;
// height: 458px;
position: absolute; position: absolute;
top: 50%; top: 50%;
left: 50%; left: 50%;
@ -1615,7 +1558,6 @@
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
overflow: hidden; overflow: hidden;
.content { .content {
height: 900rpx; height: 900rpx;
overflow-y: scroll; overflow-y: scroll;
@ -1646,19 +1588,14 @@
font-weight: bold; font-weight: bold;
} }
.settlementAgreement .setAgCount .contenta { .settlementAgreement .setAgCount .contenta {
color: #333; color: #333;
font-size: 26rpx; font-size: 26rpx;
line-height: 22px; line-height: 22px;
text-align: justify; text-align: justify;
text-justify: distribute-all-lines; text-justify: distribute-all-lines;
height: 76%; height: 76%;
overflow-y: scroll; overflow-y: scroll;
} }
.setAgCountbtn { .setAgCountbtn {
@ -1680,14 +1617,12 @@
font-family: PingFang SC-Medium, PingFang SC; font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #737373; color: #737373;
} }
.setAgCountbtnb { .setAgCountbtnb {
margin-top: 40rpx; margin-top: 40rpx;
padding-left: 20rpx; padding-left: 20rpx;
padding-right: 20rpx; padding-right: 20rpx;
text-align: center; text-align: center;
line-height: 74rpx; line-height: 74rpx;
background: #cecece; background: #cecece;
@ -1697,7 +1632,6 @@
font-family: PingFang SC-Medium, PingFang SC; font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #fff; color: #fff;
} }
.setAgCountbtnc { .setAgCountbtnc {
@ -1713,7 +1647,6 @@
font-family: PingFang SC-Medium, PingFang SC; font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #fff; color: #fff;
} }
.border { .border {
@ -1732,12 +1665,8 @@
font-weight: bold; font-weight: bold;
font-size: 34rpx; font-size: 34rpx;
} }
} }
.left-content { .left-content {
width: 680rpx; width: 680rpx;
height: 100%; height: 100%;
@ -1758,8 +1687,6 @@
} }
.content-top_img { .content-top_img {
width: 96rpx; width: 96rpx;
height: 96rpx; height: 96rpx;
border-radius: 50%; border-radius: 50%;
@ -1816,7 +1743,6 @@
font-size: 25rpx; font-size: 25rpx;
} }
} }
} }
.conter-img { .conter-img {
@ -1825,12 +1751,10 @@
margin: 0 auto; margin: 0 auto;
margin-top: 60rpx; margin-top: 60rpx;
image { image {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
} }
.content { .content {
@ -1839,7 +1763,6 @@
.content-top { .content-top {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
} }
.content-tops { .content-tops {
@ -1859,8 +1782,6 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
} }
.content-top-title { .content-top-title {

26
pages/users/embody/embody.vue
View File

@ -73,9 +73,9 @@
<view class='tip'> <view class='tip'>
当前押金: ￥{{ot_margin}} 当前押金: ￥{{ot_margin}}
</view> </view>
<view class='tip'> <view class='tip' style="line-height: 20px;">
说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额<br /> 说明: 用户下单后该订单金额存放在暂存金额中，用户确认收货后次日18:00才可提现该笔订单金额<br />
提货付款订单完成后，该笔订单金额暂存时间为20分钟<br /> 提货付款订单在完成后次日18:00才可提现
</view> </view>
<view class="btn-submit"> <view class="btn-submit">
<button formType="submit" class='bnt b-color'>提现</button> <button formType="submit" class='bnt b-color'>提现</button>
@ -117,9 +117,9 @@
<view class='tip'> <view class='tip'>
当前押金: ￥{{ot_margin}} 当前押金: ￥{{ot_margin}}
</view> </view>
<view class='tip'> <view class='tip' style="line-height: 20px;">
说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额<br /> 说明: 用户下单后该订单金额存放在暂存金额中，用户确认收货后次日18:00才可提现该笔订单金额<br />
提货付款订单完成后，该笔订单金额暂存时间为20分钟<br /> 提货付款订单在完成后次日18:00才可提现
</view> </view>
<button formType="submit" class='bnt b-color'>提现</button> <button formType="submit" class='bnt b-color'>提现</button>
</view> </view>
@ -169,9 +169,9 @@
<view class='tip'> <view class='tip'>
当前押金: ￥{{ot_margin}} 当前押金: ￥{{ot_margin}}
</view> </view>
<view class='tip'> <view class='tip' style="line-height: 20px;">
说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额<br /> 说明: 用户下单后该订单金额存放在暂存金额中，用户确认收货后次日18:00才可提现该笔订单金额<br />
提货付款订单完成后，该笔订单金额暂存时间为20分钟<br /> 提货付款订单在完成后次日18:00才可提现
</view> </view>
<view class="btn-submit"> <view class="btn-submit">
<button formType="submit" class='bnt b-color'>提现</button> <button formType="submit" class='bnt b-color'>提现</button>
@ -184,6 +184,10 @@
<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
<cash :payMode='pay_type' :pay_close="pay_close" @payClose="payClose" @onChangeFun="onChangeFun" <cash :payMode='pay_type' :pay_close="pay_close" @payClose="payClose" @onChangeFun="onChangeFun"
:order_id="currentTab"></cash> :order_id="currentTab"></cash>
<!-- 提现提示 -->
<u-modal :show="tipShow" title="提示" content='小额（1千元以下）提现2小时内到账，大额（大于1千元）提现次日18:00前到账'
@confirm="tipShow = false"></u-modal>
</view> </view>
</template> </template>
@ -220,6 +224,7 @@
}, },
data() { data() {
return { return {
tipShow: false,
extract_money: "", extract_money: "",
lock_money: "", lock_money: "",
ot_margin: "", ot_margin: "",
@ -289,6 +294,8 @@
} }
}, },
onLoad(options) { onLoad(options) {
// 提现提示
this.tipShow = true;
this.merId = options.mer_id this.merId = options.mer_id
this.source = options.source; this.source = options.source;
let data = this.$store.state.app.userInfo; let data = this.$store.state.app.userInfo;
@ -302,7 +309,6 @@
this.isAuto = true; this.isAuto = true;
this.isShowAuth = true this.isShowAuth = true
} }
}, },
methods: { methods: {
async getApply() { async getApply() {