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

add

This commit is contained in:
zmj 2024-04-30 18:57:01 +08:00
parent 9c08d45e09
commit fd5181b55c
32 changed files with 1589 additions and 1666 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
App.vue
View File

@ -92,12 +92,20 @@
console.log('消息成功' + JSON.stringify(option)); console.log('消息成功' + JSON.stringify(option));
}); });
uni.onHostEventReceive((event, data) => { uni.onHostEventReceive((event, data) => {
if (event == 'tocustomlist') { if (event == 'tocustomlist') {
Toast("收到消息")
Toast(JSON.stringify(event))
Toast(JSON.stringify(data))
if (data.page_type == 1) {
uni.switchTab({ uni.switchTab({
url: '/pages/chat/customer_list/index' url: data.route
}); });
} else {
uni.navigateTo({
url: data.route
})
}
} }
}); });

5
components/WaterfallsFlowItem/WaterfallsFlowItem.vue
View File

@ -44,8 +44,9 @@
<view class='text'> <view class='text'>
<view class='name line2'>{{item.store_name}}</view> <view class='name line2'>{{item.store_name}}</view>
<view class="score"><span <view class="score"><span
style="font-size: 23rpx;font-family: PingFang SC-Semibold, PingFang SC;font-weight: 600;color: #F84221;margin-right: 28rpx;">{{item.rate}}</span> style="font-size: 23rpx;font-weight: 600;color: #F84221;margin-right: 28rpx;">{{item.rate}}</span>
{{item.reply_count}}条评论</view> {{item.reply_count}}条评论
</view>
<view class="" style="display: flex;justify-content: space-between;"> <view class="" style="display: flex;justify-content: space-between;">
<view class='money'> <view class='money'>
<span style="font-size:30rpx;">￥</span> <span style="font-size:30rpx;">￥</span>

6
components/WaterfallsFlowItem/WaterfallsFlowItemo.vue
View File

@ -84,7 +84,6 @@
.title { .title {
font-size: 30rpx; font-size: 30rpx;
font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
margin: 12px 0; margin: 12px 0;
@ -110,7 +109,6 @@
border-radius: 11rpx 11rpx 11rpx 11rpx; border-radius: 11rpx 11rpx 11rpx 11rpx;
border: 1px solid #3274F9; border: 1px solid #3274F9;
font-size: 19rpx; font-size: 19rpx;
font-family: PingFang SC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
margin-right: 15rpx; margin-right: 15rpx;
} }
@ -125,7 +123,6 @@
border-radius: 11rpx 0px 0px 0rpx; border-radius: 11rpx 0px 0px 0rpx;
border: 1px solid #F84221; border: 1px solid #F84221;
font-size: 19rpx; font-size: 19rpx;
font-family: PingFang SC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
} }
@ -136,7 +133,6 @@
border-radius: 0px 11rpx 11rpx 0px; border-radius: 0px 11rpx 11rpx 0px;
border: 1px solid #F84221; border: 1px solid #F84221;
font-size: 19rpx; font-size: 19rpx;
font-family: PingFang SC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
} }
} }
@ -161,7 +157,6 @@
.relase-two { .relase-two {
font-size: 23rpx; font-size: 23rpx;
font-family: PingFang SC-Regular, PingFang SC;
font-weight: 500; font-weight: 500;
color: #B3B3B3; color: #B3B3B3;
margin-left: 13rpx; margin-left: 13rpx;
@ -201,7 +196,6 @@
opacity: 1; opacity: 1;
font-size: 23rpx; font-size: 23rpx;
padding-left: 11rpx; padding-left: 11rpx;
font-family: PingFang SC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #737373; color: #737373;

1
components/WaterfallsFlowItem/WaterfallsFlowItems.vue
View File

@ -94,7 +94,6 @@
.title { .title {
font-size: 30rpx; font-size: 30rpx;
font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
margin: 12px 0; margin: 12px 0;

5
components/WaterfallsFlowItemSupply/WaterfallsFlowItem.vue
View File

@ -44,8 +44,9 @@
<view class='text'> <view class='text'>
<view class='name line2'>{{item.store_name}}</view> <view class='name line2'>{{item.store_name}}</view>
<view class="score"><span <view class="score"><span
style="font-size: 23rpx;font-family: PingFang SC-Semibold, PingFang SC;font-weight: 600;color: #F84221;margin-right: 28rpx;">{{item.rate}}</span> style="font-size: 23rpx;font-weight: 600;color: #F84221;margin-right: 28rpx;">{{item.rate}}</span>
{{item.reply_count}}条评论</view> {{item.reply_count}}条评论
</view>
<view class="" style="display: flex;justify-content: space-between;"> <view class="" style="display: flex;justify-content: space-between;">
<view class='money'> <view class='money'>
<span style="font-size:30rpx;">￥</span> <span style="font-size:30rpx;">￥</span>

6
components/WaterfallsFlowItemSupply/WaterfallsFlowItemo.vue
View File

@ -84,7 +84,6 @@
.title { .title {
font-size: 30rpx; font-size: 30rpx;
font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
margin: 12px 0; margin: 12px 0;
@ -110,7 +109,6 @@
border-radius: 11rpx 11rpx 11rpx 11rpx; border-radius: 11rpx 11rpx 11rpx 11rpx;
border: 1px solid #3274F9; border: 1px solid #3274F9;
font-size: 19rpx; font-size: 19rpx;
font-family: PingFang SC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
margin-right: 15rpx; margin-right: 15rpx;
} }
@ -125,7 +123,6 @@
border-radius: 11rpx 0px 0px 0rpx; border-radius: 11rpx 0px 0px 0rpx;
border: 1px solid #F84221; border: 1px solid #F84221;
font-size: 19rpx; font-size: 19rpx;
font-family: PingFang SC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
} }
@ -136,7 +133,6 @@
border-radius: 0px 11rpx 11rpx 0px; border-radius: 0px 11rpx 11rpx 0px;
border: 1px solid #F84221; border: 1px solid #F84221;
font-size: 19rpx; font-size: 19rpx;
font-family: PingFang SC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
} }
} }
@ -161,7 +157,6 @@
.relase-two { .relase-two {
font-size: 23rpx; font-size: 23rpx;
font-family: PingFang SC-Regular, PingFang SC;
font-weight: 500; font-weight: 500;
color: #B3B3B3; color: #B3B3B3;
margin-left: 13rpx; margin-left: 13rpx;
@ -201,7 +196,6 @@
opacity: 1; opacity: 1;
font-size: 23rpx; font-size: 23rpx;
padding-left: 11rpx; padding-left: 11rpx;
font-family: PingFang SC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #737373; color: #737373;

1
components/WaterfallsFlowItemSupply/WaterfallsFlowItems.vue
View File

@ -94,7 +94,6 @@
.title { .title {
font-size: 30rpx; font-size: 30rpx;
font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
margin: 12px 0; margin: 12px 0;

2
components/content-bootom/index.vue
View File

@ -55,8 +55,6 @@
font-size: 30rpx; font-size: 30rpx;
font-family: PingFang SC-Regular,
PingFang SC;
font-weight: 400; font-weight: 400;
color: #333333; color: #333333;
} }

15
components/copyPassword/index.vue
View File

@ -38,7 +38,9 @@
// #ifdef H5 // #ifdef H5
import ClipboardJS from "@/plugin/clipboard/clipboard.js"; import ClipboardJS from "@/plugin/clipboard/clipboard.js";
// #endif // #endif
import { mapGetters } from "vuex"; import {
mapGetters
} from "vuex";
export default { export default {
props: { props: {
isCopy: { isCopy: {
@ -81,7 +83,9 @@
//#ifndef H5 //#ifndef H5
copyText: function() { copyText: function() {
let that = this; let that = this;
uni.setClipboardData({ data: this.copyUrl }); uni.setClipboardData({
data: this.copyUrl
});
setTimeout(() => { setTimeout(() => {
that.$emit('close'); that.$emit('close');
}, 500) }, 500)
@ -106,12 +110,14 @@
transform: translate3d(0, 100%, 0); transform: translate3d(0, 100%, 0);
transition: all .1s cubic-bezier(.25, .5, .5, .9); transition: all .1s cubic-bezier(.25, .5, .5, .9);
padding: 50rpx 30rpx 30rpx; padding: 50rpx 30rpx 30rpx;
.icon-guanbi { .icon-guanbi {
position: absolute; position: absolute;
top: 20rpx; top: 20rpx;
right: 20rpx; right: 20rpx;
color: #8A8A8A; color: #8A8A8A;
} }
.button { .button {
height: 76rpx; height: 76rpx;
border-radius: 38rpx; border-radius: 38rpx;
@ -122,21 +128,24 @@
color: #FFFFFF; color: #FFFFFF;
} }
} }
.copy-list-window.on { .copy-list-window.on {
transform: translate3d(0, 0, 0); transform: translate3d(0, 0, 0);
} }
.copy-list-window .title { .copy-list-window .title {
width: 100%; width: 100%;
text-align: center; text-align: center;
font-size: 32rpx; font-size: 32rpx;
font-weight: bold; font-weight: bold;
font-family: 'PingFang SC';
.iconfont { .iconfont {
font-size: 30rpx; font-size: 30rpx;
color: #FBB324; color: #FBB324;
margin-right: 12rpx; margin-right: 12rpx;
} }
} }
.copy-url { .copy-url {
margin-top: 30rpx; margin-top: 30rpx;
background: #F5F5F5; background: #F5F5F5;

3
components/cx-navTitle.vue
View File

@ -78,7 +78,6 @@
padding-right: 0rpx; padding-right: 0rpx;
scroll-behavior: smooth; //平稳的滑动效果 scroll-behavior: smooth; //平稳的滑动效果
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang-SC-Heavy;
.my-tab-item { .my-tab-item {
padding: 20rpx 35rpx; //标签上下左右距离 -- 在这里改 padding: 20rpx 35rpx; //标签上下左右距离 -- 在这里改
@ -89,7 +88,6 @@
&.active { &.active {
color: #333333; //标签选中颜色 -- 在这里改 color: #333333; //标签选中颜色 -- 在这里改
font-family: PingFang-SC-Heavy;
font-weight: 600; font-weight: 600;
position: relative; position: relative;
@ -110,7 +108,6 @@
position: relative; position: relative;
z-index: 9; z-index: 9;
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #F84221; color: #F84221;
color: #F84221; color: #F84221;

3
components/realselist/realselist.vue
View File

@ -483,7 +483,6 @@
line-height: 60rpx; line-height: 60rpx;
text-align: center; text-align: center;
font-size: 28rpx; font-size: 28rpx;
font-family: PingFang SC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #959595; color: #959595;
background-color: #E7E6E4; background-color: #E7E6E4;
@ -512,9 +511,7 @@
background: #F5F5F5; background: #F5F5F5;
border-radius: 7rpx 7rpx 7rpx 7rpx; border-radius: 7rpx 7rpx 7rpx 7rpx;
font-size: 28rpx; font-size: 28rpx;
font-family: PingFang SC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
margin-left: 20rpx; margin-left: 20rpx;

2
components/release/release.vue
View File

@ -163,14 +163,12 @@
.title1 { .title1 {
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
} }
.title2 { .title2 {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFang SC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #666666; color: #666666;
margin-top: 11rpx; margin-top: 11rpx;

2
components/shoppinglist/shoppinglist.vue
View File

@ -456,7 +456,6 @@
line-height: 60rpx; line-height: 60rpx;
text-align: center; text-align: center;
font-size: 28rpx; font-size: 28rpx;
font-family: PingFang SC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #959595; color: #959595;
background-color: #E7E6E4; background-color: #E7E6E4;
@ -485,7 +484,6 @@
background: #F5F5F5; background: #F5F5F5;
border-radius: 7rpx 7rpx 7rpx 7rpx; border-radius: 7rpx 7rpx 7rpx 7rpx;
font-size: 28rpx; font-size: 28rpx;
font-family: PingFang SC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
margin-left: 20rpx; margin-left: 20rpx;

26
components/shortPopup.vue
View File

@ -4,7 +4,8 @@
<view class="pop"> <view class="pop">
<scroll-view scroll-y class="scroll"> <scroll-view scroll-y class="scroll">
<view class="image"> <view class="image">
<swiper class="swiper" :current="current" autoplay style="width: 100%;height: 100%;" @change="changeCurrent"> <swiper class="swiper" :current="current" autoplay style="width: 100%;height: 100%;"
@change="changeCurrent">
<block v-if="product.slider_image && product.slider_image.length>0"> <block v-if="product.slider_image && product.slider_image.length>0">
<swiper-item v-for="(item,index) in product.slider_image" :key="index"> <swiper-item v-for="(item,index) in product.slider_image" :key="index">
<image class="img" :src="item" :lazy-load="true"></image> <image class="img" :src="item" :lazy-load="true"></image>
@ -14,7 +15,8 @@
<image class="img" :src="datas.image||defualtImg"></image> <image class="img" :src="datas.image||defualtImg"></image>
</swiper-item> </swiper-item>
</swiper> </swiper>
<view class="current">{{current+1}}/{{product.slider_image && product.slider_image.length||1}}</view> <view class="current">{{current+1}}/{{product.slider_image && product.slider_image.length||1}}
</view>
<image class="close" src="@/static/images/icon/close.png" @click="close()"></image> <image class="close" src="@/static/images/icon/close.png" @click="close()"></image>
<view class="border"></view> <view class="border"></view>
</view> </view>
@ -49,17 +51,20 @@
({{once_min_count}}件起购) ({{once_min_count}}件起购)
</view> </view>
<view class="input_item sub" @click="subCartNum">-</view> <view class="input_item sub" @click="subCartNum">-</view>
<input class="input_item input_view" v-model="cart_num" type="number" @input="inputCartNum" @blur="inputCartNumBlur" /> <input class="input_item input_view" v-model="cart_num" type="number"
@input="inputCartNum" @blur="inputCartNumBlur" />
<view class="input_item plus" @click="plusCartNum">+</view> <view class="input_item plus" @click="plusCartNum">+</view>
</view> </view>
</view> </view>
<view> <view>
商品库存 <text style="margin-left: 20rpx;">{{sku[changeSkuKey] ? sku[changeSkuKey].stock : change.stock}}</text> 商品库存 <text
style="margin-left: 20rpx;">{{sku[changeSkuKey] ? sku[changeSkuKey].stock : change.stock}}</text>
</view> </view>
</view> </view>
</scroll-view> </scroll-view>
<view class="button"> <view class="button">
<view class="b_icon" @click="navgo(source==12 ? '/pages/nongKe/supply_chain/shopping_trolley_other?source='+source : '/pages/nongKe/supply_chain/shopping_trolley_a')"> <view class="b_icon"
@click="navgo(source==12 ? '/pages/nongKe/supply_chain/shopping_trolley_other?source='+source : '/pages/nongKe/supply_chain/shopping_trolley_a')">
<image src="@/static/images/icon/car.png"></image> <image src="@/static/images/icon/car.png"></image>
<view>采购车</view> <view>采购车</view>
<view class="badge" v-if="goodsNum"> <view class="badge" v-if="goodsNum">
@ -79,7 +84,9 @@
postCartAdd, postCartAdd,
getProductDetail getProductDetail
} from '@/api/store.js'; } from '@/api/store.js';
import { Toast } from '../libs/uniApi'; import {
Toast
} from '../libs/uniApi';
export default { export default {
name: "shortPopup", name: "shortPopup",
props: { props: {
@ -115,8 +122,7 @@
once_min_count: 1, //最少购买件数 once_min_count: 1, //最少购买件数
}; };
}, },
mounted() { mounted() {},
},
computed: { computed: {
leftPrice() { leftPrice() {
return this.sku[this.changeSkuKey]?.wholesale_price?.split('.')[0] || '0'; return this.sku[this.changeSkuKey]?.wholesale_price?.split('.')[0] || '0';
@ -340,7 +346,6 @@
text-align: center; text-align: center;
color: #fff; color: #fff;
font-size: 26rpx; font-size: 26rpx;
font-family: PingFang SC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
} }
@ -392,7 +397,6 @@
.short_name { .short_name {
font-size: 33rpx; font-size: 33rpx;
font-family: PingFang SC-Semibold, PingFang SC;
font-weight: 600; font-weight: 600;
color: #333333; color: #333333;
} }
@ -415,7 +419,6 @@
.m_title { .m_title {
font-size: 30rpx; font-size: 30rpx;
font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
margin-top: 31rpx; margin-top: 31rpx;
@ -543,7 +546,6 @@
justify-content: center; justify-content: center;
align-items: center; align-items: center;
font-size: 30rpx; font-size: 30rpx;
font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #FFFFFF; color: #FFFFFF;
} }

65
pages/admin/financial_management/index.vue
View File

@ -4,24 +4,14 @@
<view class="top"> <view class="top">
<view> <view>
<view v-if="user_id == 0" class="accont"> <view v-if="user_id == 0" class="accont">
<u--image <u--image :showLoading="true" :src="userInfo.avatar || '../../static/img/public/man.png'"
:showLoading="true" width="44px" height="44px" shape="circle"></u--image>
:src="userInfo.avatar || '../../static/img/public/man.png'"
width="44px"
height="44px"
shape="circle"
></u--image>
<view class="name">{{ userInfo.nickname }}</view> <view class="name">{{ userInfo.nickname }}</view>
<!-- <u-icon name="setting-fill" color="white" size="20"></u-icon> --> <!-- <u-icon name="setting-fill" color="white" size="20"></u-icon> -->
</view> </view>
<view v-else class="accont"> <view v-else class="accont">
<u--image <u--image :showLoading="true" :src="userInfo.avatar || '../../static/img/public/man.png'"
:showLoading="true" width="44px" height="44px" shape="circle"></u--image>
:src="userInfo.avatar || '../../static/img/public/man.png'"
width="44px"
height="44px"
shape="circle"
></u--image>
<view class="name">{{ userInfo.nickname }}</view> <view class="name">{{ userInfo.nickname }}</view>
<!-- <u-icon name="setting-fill" color="white" size="20"></u-icon> --> <!-- <u-icon name="setting-fill" color="white" size="20"></u-icon> -->
@ -33,22 +23,14 @@
</view> </view>
<view class="center"> <view class="center">
<view class="title"> <view class="title">
<text style="margin-right: 20rpx">账户总金额(元)</text <text style="margin-right: 20rpx">账户总金额(元)</text><uni-icons @click="updateEye()"
><uni-icons :type="eyeType ? 'eye-filled' : 'eye-slash-filled'" color="#fff"></uni-icons>
@click="updateEye()"
:type="eyeType ? 'eye-filled' : 'eye-slash-filled'"
color="#fff"
></uni-icons>
</view> </view>
<view class="price" v-show="eyeType" <view class="price" v-show="eyeType">{{ all_money }}元</view>
>{{ all_money }}元</view
>
<view class="price" v-show="!eyeType">****元</view> <view class="price" v-show="!eyeType">****元</view>
<view class="bubble"> <view class="bubble">
<!-- <image src="../../static/img/contract/bubble.png"></image> --> <!-- <image src="../../static/img/contract/bubble.png"></image> -->
<view class="text" v-show="eyeType" <view class="text" v-show="eyeType">可提现金额{{ userInfo.user_money || 0.0 }}元</view>
>可提现金额{{ userInfo.user_money || 0.0 }}元</view
>
<view class="text" v-show="!eyeType">可提现金额****元</view> <view class="text" v-show="!eyeType">可提现金额****元</view>
</view> </view>
</view> </view>
@ -72,11 +54,7 @@
</view> </view>
<view class="bill"> <view class="bill">
<view style="width: 100%; height: 90rpx; background-color: #fff"></view> <view style="width: 100%; height: 90rpx; background-color: #fff"></view>
<uni-section <uni-section titleFontSize="32rpx" type="line" title="账单流水"></uni-section>
titleFontSize="32rpx"
type="line"
title="账单流水"
></uni-section>
<!-- <u-subsection :list="billTypeList" :current="current" mode="subsection"></u-subsection> --> <!-- <u-subsection :list="billTypeList" :current="current" mode="subsection"></u-subsection> -->
<!-- <view class="type_box"> <!-- <view class="type_box">
<view class="type"> <view class="type">
@ -129,11 +107,8 @@
<text v-if="item.change_type == 202" style="color: #46be61">{{ <text v-if="item.change_type == 202" style="color: #46be61">{{
item.type_desc item.type_desc
}}</text> }}</text>
<text <text v-else-if="item.change_type == 203"
v-else-if="item.change_type == 203" style="color: #ff7c32">{{ item.type_desc }}</text>
style="color: #ff7c32"
>{{ item.type_desc }}</text
>
<text v-else="item.change_type == 203">{{ <text v-else="item.change_type == 203">{{
item.type_desc item.type_desc
}}</text> }}</text>
@ -172,12 +147,8 @@
</view> </view>
--> -->
<u-loadmore <u-loadmore :status="loadConfig.status" :loading-text="loadConfig.loadingText"
:status="loadConfig.status" :loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
:loading-text="loadConfig.loadingText"
:loadmore-text="loadConfig.loadmoreText"
:nomore-text="loadConfig.nomoreText"
/>
</view> </view>
<!-- 月账单 --> <!-- 月账单 -->
<view class="bill_list" v-show="current == 1"> <view class="bill_list" v-show="current == 1">
@ -192,11 +163,9 @@
<view class="num">{{ item.income }}</view> <view class="num">{{ item.income }}</view>
</view> </view>
<view class="right"> <view class="right">
<view <view>支出金额:{{
>支出金额:{{
item.expenditure > 0 ? item.expenditure : "0.00" item.expenditure > 0 ? item.expenditure : "0.00"
}}</view }}</view>
>
<view>入账金额:{{ item.income > 0 ? item.income : "0.00" }}</view> <view>入账金额:{{ item.income > 0 ? item.income : "0.00" }}</view>
</view> </view>
</view> </view>
@ -441,8 +410,7 @@ page {
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
.text { .text {}
}
} }
} }
@ -599,7 +567,6 @@ page {
.top { .top {
margin-bottom: 28rpx; margin-bottom: 28rpx;
font-size: 25rpx; font-size: 25rpx;
font-family: PingFang SC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #333333; color: #333333;

8
pages/commissionedSales/addDelegation/index.vue
View File

@ -9,8 +9,8 @@
<view class="item-one"> <view class="item-one">
被委托商家 被委托商家
</view> </view>
<e-select v-model="formData.entrust_mer_id" :value='formData.entrust_mer_id' :options="options1" @change="change1" <e-select v-model="formData.entrust_mer_id" :value='formData.entrust_mer_id' :options="options1"
placeholder="选择选项"></e-select> @change="change1" placeholder="选择选项"></e-select>
</view> </view>
<view class="release_item-one"> <view class="release_item-one">
<view class="item-one"> <view class="item-one">
@ -316,7 +316,6 @@
.center-one-txt { .center-one-txt {
.one-txta { .one-txta {
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
} }
@ -325,7 +324,6 @@
display: flex; display: flex;
margin-top: 28rpx; margin-top: 28rpx;
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC;
font-weight: 400; font-weight: 400;
color: #999999; color: #999999;
@ -351,7 +349,6 @@
margin-top: 32rpx; margin-top: 32rpx;
margin-bottom: 20rpx; margin-bottom: 20rpx;
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #333333; color: #333333;
} }
@ -525,7 +522,6 @@
background: linear-gradient(84deg, #F98649 0%, #F34E45 100%); background: linear-gradient(84deg, #F98649 0%, #F34E45 100%);
border-radius: 42px 42px 42px 42px; border-radius: 42px 42px 42px 42px;
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #FFFFFF; color: #FFFFFF;
} }

9
pages/commissionedSales/delegation_details/index.vue
View File

@ -101,7 +101,8 @@
<view class="center-twoa"> <view class="center-twoa">
拒绝原因: 拒绝原因:
</view> </view>
<view class="center-twob" :style="{'text-align':objinfo.entrust_finish_refusal.length<15?'right':'left'}"> <view class="center-twob"
:style="{'text-align':objinfo.entrust_finish_refusal.length<15?'right':'left'}">
{{objinfo.entrust_finish_refusal}} {{objinfo.entrust_finish_refusal}}
</view> </view>
</view> </view>
@ -233,7 +234,6 @@
.top-two-one { .top-two-one {
font-size: 35rpx; font-size: 35rpx;
font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #FFFFFF; color: #FFFFFF;
margin-top: 10rpx; margin-top: 10rpx;
@ -280,7 +280,6 @@
.center-one-txt { .center-one-txt {
.one-txta { .one-txta {
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
} }
@ -289,7 +288,6 @@
display: flex; display: flex;
margin-top: 28rpx; margin-top: 28rpx;
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC;
font-weight: 400; font-weight: 400;
color: #999999; color: #999999;
@ -316,7 +314,6 @@
.center-twoa { .center-twoa {
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC;
font-weight: 400; font-weight: 400;
color: #333333; color: #333333;
} }
@ -327,7 +324,6 @@
word-wrap: break-word; word-wrap: break-word;
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC;
font-weight: 400; font-weight: 400;
color: #999999; color: #999999;
} }
@ -377,7 +373,6 @@
background: linear-gradient(84deg, #F98649 0%, #F34E45 100%); background: linear-gradient(84deg, #F98649 0%, #F34E45 100%);
border-radius: 42px 42px 42px 42px; border-radius: 42px 42px 42px 42px;
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #FFFFFF; color: #FFFFFF;
position: absolute; position: absolute;

2
pages/commissionedSales/index/index.vue
View File

@ -147,7 +147,6 @@
.titlea { .titlea {
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #FFFFFF; color: #FFFFFF;
} }
@ -155,7 +154,6 @@
.titleb { .titleb {
margin-top: 5rpx; margin-top: 5rpx;
font-size: 25rpx; font-size: 25rpx;
font-family: PingFang SC;
font-weight: 400; font-weight: 400;
color: rgba(255, 255, 255, 0.8); color: rgba(255, 255, 255, 0.8);
} }

28
pages/commissionedSales/initiateDelegation/index.vue
View File

@ -542,7 +542,6 @@
.adddelegation-two { .adddelegation-two {
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #FFFFFF; color: #FFFFFF;
margin-top: 25rpx; margin-top: 25rpx;
@ -593,7 +592,6 @@
.txt-b-a { .txt-b-a {
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
} }
@ -612,7 +610,6 @@
.txt-b-b { .txt-b-b {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFang SC;
font-weight: 400; font-weight: 400;
color: #333333 color: #333333
} }
@ -625,15 +622,18 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
.text-bottom { .text-bottom {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
} }
.one-txt-a { .one-txt-a {
flex: 1; flex: 1;
font-size: 30rpx; font-size: 30rpx;
display: -webkit-box; display: -webkit-box;
-webkit-line-clamp: 2; /* 限制为三行 */ -webkit-line-clamp: 2;
/* 限制为三行 */
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
@ -686,7 +686,6 @@
.contentgn_a { .contentgn_a {
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC;
font-weight: 400; font-weight: 400;
color: #F84221; color: #F84221;
margin-right: 10rpx; margin-right: 10rpx;
@ -704,7 +703,6 @@
.contentgn_b { .contentgn_b {
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC;
font-weight: 400; font-weight: 400;
color: #999999; color: #999999;
margin-left: 10rpx; margin-left: 10rpx;
@ -760,7 +758,6 @@
.contentgn_a { .contentgn_a {
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC;
font-weight: 400; font-weight: 400;
color: #F84221; color: #F84221;
margin-right: 10rpx; margin-right: 10rpx;
@ -777,7 +774,6 @@
.contentgn_b { .contentgn_b {
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC;
font-weight: 400; font-weight: 400;
color: #999999; color: #999999;
margin-left: 10rpx; margin-left: 10rpx;
@ -819,7 +815,6 @@
.bg-content-a { .bg-content-a {
margin-left: 242rpx; margin-left: 242rpx;
font-size: 35rpx; font-size: 35rpx;
font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
} }
@ -827,14 +822,12 @@
.bg-content-b { .bg-content-b {
margin-left: 35rpx; margin-left: 35rpx;
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
margin-top: 32rpx; margin-top: 32rpx;
span { span {
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #F84221; color: #F84221;
margin-left: 18rpx; margin-left: 18rpx;
@ -844,14 +837,12 @@
.bg-content-c { .bg-content-c {
margin-left: 35rpx; margin-left: 35rpx;
font-size: 35rpx; font-size: 35rpx;
font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
margin-top: 32rpx; margin-top: 32rpx;
span { span {
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #F84221; color: #F84221;
margin-left: 18rpx; margin-left: 18rpx;
@ -867,7 +858,6 @@
height: 95rpx; height: 95rpx;
line-height: 95rpx; line-height: 95rpx;
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC;
font-weight: 400; font-weight: 400;
color: #999999; color: #999999;
margin-left: 121rpx; margin-left: 121rpx;
@ -880,7 +870,6 @@
line-height: 95rpx; line-height: 95rpx;
text-align: center; text-align: center;
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #FFFFFF; color: #FFFFFF;
background: linear-gradient(180deg, #F98649 0%, #F34E45 100%); background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);
@ -904,7 +893,6 @@
.bg-content-a { .bg-content-a {
margin-left: 242rpx; margin-left: 242rpx;
font-size: 35rpx; font-size: 35rpx;
font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
} }
@ -917,7 +905,6 @@
height: 95rpx; height: 95rpx;
line-height: 95rpx; line-height: 95rpx;
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC;
font-weight: 400; font-weight: 400;
color: #999999; color: #999999;
margin-left: 121rpx; margin-left: 121rpx;
@ -930,7 +917,6 @@
line-height: 95rpx; line-height: 95rpx;
text-align: center; text-align: center;
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #FFFFFF; color: #FFFFFF;
background: linear-gradient(180deg, #F98649 0%, #F34E45 100%); background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);
@ -957,7 +943,6 @@
.bg-content-a { .bg-content-a {
margin-left: 242rpx; margin-left: 242rpx;
font-size: 35rpx; font-size: 35rpx;
font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
} }
@ -965,14 +950,12 @@
.bg-content-b { .bg-content-b {
margin-left: 35rpx; margin-left: 35rpx;
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
margin-top: 32rpx; margin-top: 32rpx;
span { span {
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #F84221; color: #F84221;
margin-left: 18rpx; margin-left: 18rpx;
@ -982,14 +965,12 @@
.bg-content-c { .bg-content-c {
margin-left: 35rpx; margin-left: 35rpx;
font-size: 35rpx; font-size: 35rpx;
font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
margin-top: 22rpx; margin-top: 22rpx;
span { span {
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #F84221; color: #F84221;
margin-left: 18rpx; margin-left: 18rpx;
@ -1017,7 +998,6 @@
line-height: 95rpx; line-height: 95rpx;
text-align: center; text-align: center;
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #FFFFFF; color: #FFFFFF;
background: linear-gradient(180deg, #F98649 0%, #F34E45 100%); background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);

37
pages/commissionedSales/receivedCommission/index.vue
View File

@ -59,22 +59,26 @@
<view class="content-two_oneq" v-if="item.mer_status==1"> <view class="content-two_oneq" v-if="item.mer_status==1">
<view class="contentgn"> <view class="contentgn">
<block v-if="item.entrust_order_id>0&&item.mer_status==1"> <block v-if="item.entrust_order_id>0&&item.mer_status==1">
<view class="contentgn_a" v-if="item.entrust_finish==0" style="margin-left: 10rpx;" @click="closingorder(item)"> <view class="contentgn_a" v-if="item.entrust_finish==0"
style="margin-left: 10rpx;" @click="closingorder(item)">
申请结束 申请结束
</view> </view>
<view class="contentgn_a" v-else-if="item.entrust_finish==1" style="margin-left: 10rpx; color: #20A162;"> <view class="contentgn_a" v-else-if="item.entrust_finish==1"
style="margin-left: 10rpx; color: #20A162;">
已结束 已结束
</view> </view>
<view class="contentgn_a" v-else-if="item.entrust_finish==2" @click="closingorder(item)" style="margin-left: 10rpx;"> <view class="contentgn_a" v-else-if="item.entrust_finish==2"
@click="closingorder(item)" style="margin-left: 10rpx;">
被拒绝 被拒绝
</view> </view>
<view class="contentgn_a" v-else-if="item.entrust_finish==3" style="margin-left: 10rpx; color: #FE9A10;"> <view class="contentgn_a" v-else-if="item.entrust_finish==3"
style="margin-left: 10rpx; color: #FE9A10;">
申请中 申请中
</view> </view>
<span></span> <span></span>
</block> </block>
<view class="contentgn_a" v-if="item.entrust_order_id==0" style="margin-left: 10rpx;" <view class="contentgn_a" v-if="item.entrust_order_id==0"
@click="order(item)"> style="margin-left: 10rpx;" @click="order(item)">
去下单 去下单
</view> </view>
<span v-if="item.entrust_order_id==0"></span> <span v-if="item.entrust_order_id==0"></span>
@ -531,7 +535,6 @@
.txt-b-a { .txt-b-a {
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
} }
@ -550,7 +553,6 @@
.txt-b-b { .txt-b-b {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFang SC;
font-weight: 400; font-weight: 400;
color: #333333 color: #333333
} }
@ -563,15 +565,18 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
.text-bottom { .text-bottom {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
} }
.one-txt-a { .one-txt-a {
flex: 1; flex: 1;
font-size: 30rpx; font-size: 30rpx;
display: -webkit-box; display: -webkit-box;
-webkit-line-clamp: 2; /* 限制为三行 */ -webkit-line-clamp: 2;
/* 限制为三行 */
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
@ -624,7 +629,6 @@
.contentgn_a { .contentgn_a {
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC;
font-weight: 400; font-weight: 400;
color: #F84221; color: #F84221;
margin-right: 10rpx; margin-right: 10rpx;
@ -642,7 +646,6 @@
.contentgn_b { .contentgn_b {
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC;
font-weight: 400; font-weight: 400;
color: #999999; color: #999999;
margin-left: 10rpx; margin-left: 10rpx;
@ -698,7 +701,6 @@
.contentgn_a { .contentgn_a {
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC;
font-weight: 400; font-weight: 400;
color: #F84221; color: #F84221;
margin-right: 10rpx; margin-right: 10rpx;
@ -716,7 +718,6 @@
.contentgn_b { .contentgn_b {
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC;
font-weight: 400; font-weight: 400;
color: #999999; color: #999999;
margin-left: 10rpx; margin-left: 10rpx;
@ -757,7 +758,6 @@
.bg-content-a { .bg-content-a {
margin-left: 242rpx; margin-left: 242rpx;
font-size: 35rpx; font-size: 35rpx;
font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
} }
@ -765,14 +765,12 @@
.bg-content-b { .bg-content-b {
margin-left: 35rpx; margin-left: 35rpx;
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
margin-top: 16rpx; margin-top: 16rpx;
span { span {
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #F84221; color: #F84221;
margin-left: 18rpx; margin-left: 18rpx;
@ -782,30 +780,27 @@
.bg-content-c { .bg-content-c {
margin-left: 35rpx; margin-left: 35rpx;
font-size: 35rpx; font-size: 35rpx;
font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
margin-top: 16rpx; margin-top: 16rpx;
span { span {
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #F84221; color: #F84221;
margin-left: 18rpx; margin-left: 18rpx;
} }
} }
.bg-content-d { .bg-content-d {
margin-left: 35rpx; margin-left: 35rpx;
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
margin-top: 16rpx; margin-top: 16rpx;
span { span {
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #F84221; color: #F84221;
margin-left: 18rpx; margin-left: 18rpx;
@ -821,7 +816,6 @@
height: 95rpx; height: 95rpx;
line-height: 95rpx; line-height: 95rpx;
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC;
font-weight: 400; font-weight: 400;
color: #999999; color: #999999;
margin-left: 121rpx; margin-left: 121rpx;
@ -834,7 +828,6 @@
line-height: 95rpx; line-height: 95rpx;
text-align: center; text-align: center;
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #FFFFFF; color: #FFFFFF;
background: linear-gradient(180deg, #F98649 0%, #F34E45 100%); background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);

84
pages/index/index.vue
View File

@ -1,6 +1,5 @@
<template> <template>
<view class="content"> <view class="content">
<button @click="openDiver">anniu</button>
<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">
@ -85,10 +84,11 @@
常用工具 常用工具
<view class=""></view> <view class=""></view>
</view> </view>
<view class="tools-two" <!-- <view class="tools-two"
v-if="isgShow&&userInfoData.mer_info.setting_status==1&&userInfoData.mer_info.type_code=='TypeSupplyChain'"> v-if="isgShow&&userInfoData.mer_info.setting_status==1&&userInfoData.mer_info.type_code=='TypeSupplyChain'">
<view class="" v-for="(item,k) in typelistSupplyChain" :key='k' @click="navation(item)"> <view class="" v-for="(item,k) in typelistSupplyChain" :key='k' @click="navation(item)">
<view class="tools-two-img"> <view class="tools-two-img">
<image :src="item.image" mode=""></image> <image :src="item.image" mode=""></image>
</view> </view>
<view class="tools-two-title"> {{item.name}}</view> <view class="tools-two-title"> {{item.name}}</view>
@ -98,12 +98,13 @@
v-else-if="isgShow&&userInfoData.mer_info.setting_status==1&&userInfoData.mer_info.type_code=='PersonalStore'"> v-else-if="isgShow&&userInfoData.mer_info.setting_status==1&&userInfoData.mer_info.type_code=='PersonalStore'">
<view class="" v-for="(item,k) in typePersonalStoreList" :key='k' @click="navation(item)"> <view class="" v-for="(item,k) in typePersonalStoreList" :key='k' @click="navation(item)">
<view class="tools-two-img"> <view class="tools-two-img">
<image :src="item.image" mode=""></image> <image :src="item.image" mode=""></image>
</view> </view>
<view class="tools-two-title"> {{item.name}}</view> <view class="tools-two-title"> {{item.name}}</view>
</view> </view>
</view> </view> -->
<view class="tools-two" v-else-if="isgShow&&userInfoData.mer_info.setting_status==1"> <view class="tools-two" v-if="isgShow">
<view class="" v-for="(item,k) in typelist" :key='k' @click="navation(item)"> <view class="" v-for="(item,k) in typelist" :key='k' @click="navation(item)">
<view class="tools-two-img " :id="'asas'+k"> <view class="tools-two-img " :id="'asas'+k">
<image :src="item.image" mode=""></image> <image :src="item.image" mode=""></image>
@ -111,17 +112,15 @@
<view class="tools-two-title"> {{item.name}}</view> <view class="tools-two-title"> {{item.name}}</view>
</view> </view>
</view> </view>
<view class="tools-two" v-else> <!-- <view class="tools-two" v-else>
<view class="" @click="byset"> <view class="" @click="byset">
<view class="tools-two-img"> <view class="tools-two-img">
<image src="@/static/images/index11.png" mode=""></image> <image src="@/static/images/index11.png" mode=""></image>
</view> </view>
<view class="tools-two-title"> 商家设置</view> <view class="tools-two-title"> 商家设置</view>
</view> </view>
</view> -->
</view> </view>
</view>
<view class="content-list"> <view class="content-list">
<view style="width: 100%;background-color: #fff;"> <view style="width: 100%;background-color: #fff;">
<view class="tools-one"> <view class="tools-one">
@ -457,6 +456,7 @@
}, },
data() { data() {
return { return {
subNVue: '',
elInfo: {}, elInfo: {},
isAuto: false, //没有授权的不会自动授权 isAuto: false, //没有授权的不会自动授权
isShowAuth: false, //是否隐藏授权 isShowAuth: false, //是否隐藏授权
@ -850,6 +850,7 @@
}, },
async onLoad() { async onLoad() {
this.subNVue = uni.getSubNVueById('concat')
this.Fheight = uni.getSystemInfoSync().windowHeight + 'px'; this.Fheight = uni.getSystemInfoSync().windowHeight + 'px';
await this.$onLaunched; await this.$onLaunched;
this.list1(); this.list1();
@ -859,6 +860,7 @@
this.loadEndFlag = true; this.loadEndFlag = true;
}); });
uni.$on('diverIndexSubEmit', () => { uni.$on('diverIndexSubEmit', () => {
this.subNVue.hide()
uni.navigateTo({ uni.navigateTo({
url: '/pages/product/list/index?diver=1' url: '/pages/product/list/index?diver=1'
}) })
@ -875,10 +877,34 @@
} }
}, },
onReady() { onReady() {
// if (Boolean(this.$store.state.app.userInfo.service?.mer_id)) {
// isNewMer(this.$store.state.app.userInfo.uid, this.$store.state.app.userInfo.service?.mer_id).then(res => {
// if (res.data == 'true') {
// let that = this
// const query = uni.createSelectorQuery().in(this);
// query
// .select(".tools-two-img")
// .boundingClientRect((data) => {
// let info = JSON.stringify(data)
// that.elInfo = data
// // #ifdef APP-PLUS
// that.openDiver()
// // #endif
// })
// .exec();
// }
// })
// }
},
onShow() {
if (Boolean(this.$store.state.app.userInfo.service?.mer_id)) { if (Boolean(this.$store.state.app.userInfo.service?.mer_id)) {
isNewMer(this.$store.state.app.userInfo.uid, this.$store.state.app.userInfo.service?.mer_id).then(res => { isNewMer(this.$store.state.app.userInfo.uid, this.$store.state.app.userInfo.service?.mer_id).then(
return res => {
if (res.data == 'true') { console.log(res.data)
if (res.data == 'true' && this.elInfo) {
let that = this let that = this
const query = uni.createSelectorQuery().in(this); const query = uni.createSelectorQuery().in(this);
query query
@ -895,25 +921,6 @@
}) })
} }
},
onShow() {
if (Boolean(this.$store.state.app.userInfo.service?.mer_id)) {
isNewMer(this.$store.state.app.userInfo.uid, this.$store.state.app.userInfo.service?.mer_id).then(
res => {
return
if (res.data == 'true' && this.elInfo) {
console.log('resdaa', res.data)
this.openDiver()
}
})
}
if (this.loadEndFlag) { if (this.loadEndFlag) {
this.getUserInfo(); this.getUserInfo();
this.codelist(); this.codelist();
@ -925,9 +932,22 @@
this.$bus.$off('value-updated') this.$bus.$off('value-updated')
}, },
methods: { methods: {
test1() {
isNewMer(this.$store.state.app.userInfo.uid, this.$store.state.app.userInfo.service?.mer_id).then(res => {
console.log(res, 'res')
})
},
test2() {
isNewMer(this.$store.state.app.userInfo.uid, this.$store.state.app.userInfo.service?.mer_id, {
done: 1
}).then(res => {
console.log(res, 'res')
})
},
openDiver() { openDiver() {
const subNVue = uni.getSubNVueById('concat') this.subNVue.show('zoom-out', 300)
subNVue.show('zoom-out', 300)
uni.$emit('diverIndexEmit', this.elInfo); uni.$emit('diverIndexEmit', this.elInfo);
}, },
// 提现页面 // 提现页面

16
pages/index/subnvue/concat.nvue
View File

@ -24,6 +24,9 @@
</template> </template>
<script> <script>
import {
isNewMer
} from '@/api/user.js';
export default { export default {
data() { data() {
return { return {
@ -37,16 +40,17 @@
}, },
methods: { methods: {
jump() { jump() {
isNewMer(this.$store.state.app.userInfo.uid, this.$store.state.app.userInfo.service?.mer_id, {
done: 1
}).then(res => {
console.log(res, 'res')
})
this.subNVue.hide('zoom-in', 300, ) this.subNVue.hide('zoom-in', 300, )
}, },
next() { next() {
this.subNVue = uni.getSubNVueById('concat') // this.subNVue = uni.getSubNVueById('concat')
this.subNVue.hide('zoom-in', 300, ) // this.subNVue.hide('zoom-in', 300, )
setTimeout(() => {
uni.$emit('diverIndexSubEmit'); uni.$emit('diverIndexSubEmit');
}, 300)
} }
}, },

1
pages/product/addGood/addGood.vue
View File

@ -487,7 +487,6 @@
box-sizing: border-box; box-sizing: border-box;
padding: 20rpx; padding: 20rpx;
padding-bottom: 200rpx; padding-bottom: 200rpx;
font-family: PingFangRegular;
} }

3
pages/product/addGoodDetail/addGoodDetail.vue
View File

@ -227,7 +227,7 @@
<view class=""> <view class="">
温馨提示 温馨提示
</view> </view>
<view class="" style="font-family: PingFangFamily;font-size: 36rpx;"> <view class="" style="font-size: 36rpx;">
发布中断可能导致商机流失 发布中断可能导致商机流失
</view> </view>
<view class="" style="font-size: 26rpx;color: #777777;"> <view class="" style="font-size: 26rpx;color: #777777;">
@ -794,7 +794,6 @@
background-color: #F1F1F1; background-color: #F1F1F1;
box-sizing: border-box; box-sizing: border-box;
padding-bottom: 280rpx; padding-bottom: 280rpx;
font-family: PingFangRegular;
padding: 20rpx 20rpx 200rpx 20rpx; padding: 20rpx 20rpx 200rpx 20rpx;

9
pages/product/addGoodDetail/goodsAttr.vue
View File

@ -378,13 +378,9 @@
</script> </script>
<style lang='scss'> <style lang='scss'>
.MediumFont { .MediumFont {}
font-family: PingFangFamily;
}
.RegularFont { .RegularFont {}
font-family: PingFangRegular;
}
.content { .content {
box-sizing: border-box; box-sizing: border-box;
@ -393,7 +389,6 @@
min-height: 100vh; min-height: 100vh;
position: relative; position: relative;
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangFamily;
} }
.label-cls { .label-cls {

4
pages/product/addGoodDetail/goodsPrice.vue
View File

@ -5,7 +5,7 @@
</view> </view>
<view class="card" v-for="(item,index) in attrValue"> <view class="card" v-for="(item,index) in attrValue">
<view class="card-head card-li"> <view class="card-head card-li">
<text style="font-size: 32rpx;font-family: PingFangFamily;">规格{{index+1}}</text> <text style="font-size: 32rpx;">规格{{index+1}}</text>
<view class="" style="width: 300rpx;"> <view class="" style="width: 300rpx;">
<!-- {{formData.attr}} --> <!-- {{formData.attr}} -->
<!-- <u--input placeholder="请输入规格名称" inputAlign='right' v-model="formData.attr[index].value"></u--input> --> <!-- <u--input placeholder="请输入规格名称" inputAlign='right' v-model="formData.attr[index].value"></u--input> -->
@ -331,9 +331,7 @@
min-height: 100vh; min-height: 100vh;
position: relative; position: relative;
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangRegular;
padding-bottom: 200rpx; padding-bottom: 200rpx;
/* font-family: PingFangFamily; */
.card { .card {

9
pages/product/addGoodDetail/goodsSearch.vue
View File

@ -115,13 +115,9 @@
</script> </script>
<style lang='scss'> <style lang='scss'>
.MediumFont { .MediumFont {}
font-family: PingFangFamily;
}
.RegularFont { .RegularFont {}
font-family: PingFangRegular;
}
.content { .content {
box-sizing: border-box; box-sizing: border-box;
@ -129,7 +125,6 @@
min-height: 100vh; min-height: 100vh;
position: relative; position: relative;
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangRegular;
.types { .types {
display: flex; display: flex;

1
pages/product/addGoodDetail/goodsType.vue
View File

@ -119,7 +119,6 @@
background-color: white; background-color: white;
min-height: 100vh; min-height: 100vh;
position: relative; position: relative;
font-family: PingFangRegular;
.lines { .lines {
height: 16px; height: 16px;

2
pages/product/list/subnvue/concat.nvue
View File

@ -50,7 +50,7 @@
next() { next() {
this.subNVue.hide('zoom-in', 300, ) this.subNVue.hide('zoom-in', 300, )
isNewMer(this.$store.state.app.userInfo.uid, this.$store.state.app.userInfo.service?.mer_id, { isNewMer(this.$store.state.app.userInfo.uid, this.$store.state.app.userInfo.service?.mer_id, {
done: true done: 1
}).then(res => { }).then(res => {
console.log('res', res) console.log('res', res)
}) })

10
static/css/base.css
View File

@ -413,13 +413,3 @@ checkbox .uni-checkbox-input.uni-checkbox-input-checked::before {
height: 80rpx; height: 80rpx;
overflow: hidden overflow: hidden
} }
@font-face {
font-family: PingFangFamily;
src: url('/static/font/PingFangMedium.ttf');
}
@font-face {
font-family: PingFangRegular;
src: url('/static/font/PingFangRegular.ttf');
}

BIN
static/font/PingFangMedium.ttf
View File

Binary file not shown.

BIN
static/font/PingFangRegular.ttf
View File

Binary file not shown.