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

更新

This commit is contained in:
weipengfei 2024-03-01 17:06:50 +08:00
parent c9e220cd96
commit 0dd1e510c2
10 changed files with 155 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
components/activePopup.vue Normal file
View File

@ -0,0 +1,120 @@
<template>
<view>
<uni-popup ref="activityPopup" :is-mask-click="false">
<view class="a_c_home">
<view class="c_card">
<view class="c_content">
<scroll-view style="height: 100%;" scroll-y>
<view v-if="info.content" v-html="info.content.content"></view>
</scroll-view>
</view>
</view>
<image class="head_img" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/ab014202402291802294524.png" info="活动标题"></image>
<view class="head_title">春耕采购补贴</view>
<image class="close_img" @click="close" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/close.png" info="关闭按钮"></image>
</view>
</uni-popup>
</view>
</template>
<script>
import { getArticleList } from "@/api/api.js"
export default {
data(){
return {
info: ''
}
},
created() {
},
watch:{
},
methods:{
close(){
this.$emit('close');
},
getArticleList(){
getArticleList(28).then(res=>{
console.log(res);
})
}
}
}
</script>
<style lang="scss">
.a_c_home{
width: 600rpx;
/* #ifdef H5 */
height: 75vh;
/* #endif */
/* #ifndef H5 */
height: 90vh;
/* #endif */
// border: 1px solid red;
position: relative;
.head_img{
width: 419rpx;
height: 86rpx;
position: absolute;
top: 130rpx;
left: 50%;
transform: translate(-50%);
}
.head_title{
width: 419rpx;
height: 86rpx;
position: absolute;
top: 130rpx;
left: 50%;
transform: translate(-50%);
display: flex;
justify-content: center;
align-items: center;
color: #9C3922;
font-weight: bold;
font-size: 34rpx;
}
.c_card{
height: calc(100% - 300rpx);
width: 100%;
background-color: #fff;
position: absolute;
border-radius: 50rpx;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
padding: 30rpx;
padding-top: 70rpx;
display: flex;
flex-direction: column;
justify-content: space-between;
align-items: center;
.c_content{
height: 100%;
width: 100%;
// background-color: #eee;
}
.btn_box{
display: flex;
flex-direction: column;
justify-content: space-between;
align-items: center;
.btn_img{
width: 461rpx;
height: 100rpx;
}
}
}
.close_img{
position: absolute;
bottom: 60rpx;
left: 50%;
transform: translate(-50%);
width: 60rpx;
height: 60rpx;
}
}
</style>

4
pages/activeCode/subsidy.vue
View File

@ -151,7 +151,6 @@
getSubsidy(this.mer_id, {
type: this.type
}).then(res=>{
console.log(res);
this.info = res.data;
})
},
@ -167,13 +166,14 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss">
page{
background-color: #fff;
}
.page {
position: relative;
font-size: 28rpx;
background-color: #fff;
}
.bg {

2
pages/admin/order_cancellation/index.vue
View File

@ -1,7 +1,7 @@
<template>
<view class="page">
<view class="OrderCancellation">
<view class="header":style="{ 'background-image': `url(${domain}/static/images/cancellation-header.png)`}">
<view class="header":style="{ 'background-image': `url(https://lihai001.oss-cn-chengdu.aliyuncs.com/public/static/cancellation-header.png)`}">
</view>
<view class="scan_count">
<view class="scan_bg"></view>

5
pages/auth/index.vue
View File

@ -33,12 +33,13 @@
} = option;
wechat.auth(code, state)
.then(() => {
// console.log(decodeURIComponent(decodeURIComponent(option.back_url)),'back_url')
console.log(decodeURIComponent(decodeURIComponent(option.back_url)),'back_url')
const href = decodeURIComponent(decodeURIComponent(option.back_url))
location.replace(href)
})
.catch((err) => {
location.replace("/");
console.log();
location.replace("/pages/users/login/index_copy");
});
}
};

26
pages/index/index.vue
View File

@ -448,10 +448,7 @@ import { Toast } from '../../libs/uniApi';
isShowAuth: false, //是否隐藏授权
loadEndFlag: false,
list: [{
name: '今日成交额',
value: 0
}, {
name: '今日订单数',
name: '账户总金额',
value: 0
}, {
name: '本月订单数',
@ -552,11 +549,13 @@ import { Toast } from '../../libs/uniApi';
name: '入库管理',
type: 13,
image: require('@/static/images/index9.png')
}, {
},
{
name: '订单管理',
type: 2,
image: require('@/static/images/index1.png')
}, {
},
{
name: '提现管理',
type: 5,
image: require('@/static/images/index8.png')
@ -621,6 +620,11 @@ import { Toast } from '../../libs/uniApi';
type: 16,
image: require('@/static/images/index23.png')
},
{
name: '全部',
type: 8,
image: require('@/static/images/index3.png')
}
],
refundInfo: {},
company: '',
@ -628,7 +632,6 @@ import { Toast } from '../../libs/uniApi';
show: false,
refundMark: false,
where: {
page: 1,
limit: 3,
status: 2
@ -1098,9 +1101,7 @@ import { Toast } from '../../libs/uniApi';
this.order[2].value = res.data.order.untake
this.order[3].value = res.data.order.unevaluate
this.order[4].value = res.data.order.refund
this.list[0].value = res.data.data.today.payPrice
this.list[1].value = res.data.data.today.orderNum
this.list[2].value = res.data.data.month.orderNum
this.list[1].value = res.data.data.month.orderNum
},
err => {
that.$util.Tips({
@ -1142,6 +1143,7 @@ import { Toast } from '../../libs/uniApi';
res.data.mer_info.is_company?res.data.mer_info.is_company=1:res.data.mer_info.is_company=0
this.userid = res.data.uid
this.userInfoData = res.data;
this.list[0].value = res.data.now_money;
this.$store.commit('SET_USERINFO', res.data);
this.merchantData.phone = res.data.phone;
if(res.data.mer_info.is_company==0) !this.merchantData.company_name ? this.merchantData.company_name = "" : null;
@ -2054,7 +2056,9 @@ import { Toast } from '../../libs/uniApi';
margin-top: 61rpx;
.content-middlea {
width: 161rpx;
// width: 161rpx;
flex: 1;
flex-shrink: 0;
text-align: center;
.content-middlea-one {

19
pages/moreProject/moreProject.vue
View File

@ -117,7 +117,7 @@
</view>
<view class="business com"
v-if="userInfoData.mer_info.type_code === 'TypeStore'||userInfoData.mer_info.type_code === 'TypeTownSupplyChain'">
v-if="userInfoData.mer_info.type_code === 'TypeStore'||userInfoData.mer_info.type_code === 'TypeTownSupplyChain'||userInfoData.mer_info.type_code === 'PersonalStore'">
<view class="business com" v-if="true">
<view class="special_work com">
<view class="title">我的店铺</view>
@ -159,11 +159,11 @@
<image class="icon_img" src="@/static/images/index13.png" mode="aspectFit"></image>
<text class="text">转账订单</text>
</view>
<view class="examine" @click="navigator(`/pages/admin/stockOut/index?mer_id=${mer_id}`)">
<!-- <view class="examine" @click="navigator(`/pages/admin/stockOut/index?mer_id=${mer_id}`)">
<image class="icon_img" src="@/static/images/index10.png" mode="aspectFit">
</image>
<text class="text">扫码出库</text>
</view>
</view> -->
<view class="examine"
@click="navigator(`/pages/nongKe/gather/select_warehouse?mer_id=${mer_id}&stype=2`)">
<image class="icon_img" src="@/static/images/index9.png" mode="aspectFit">
@ -257,7 +257,7 @@
<view class="examine" @click="navigator(`/pages/payment/qrcode`)">
<image class="icon_img" src="@/static/images/index24.png" mode="aspectFit">
</image>
<text class="text">面对面交易</text>
<text class="text">面对面收款</text>
</view>
<!-- <view class="examine" @click="navigator(`/pages/users/user_invoice_Finance/index?mer_id=${mer_id}`)">
@ -301,11 +301,11 @@
<image class="icon_img" src="@/static/images/index5.png" mode="aspectFit"></image>
<text class="text">进货管理</text>
</view>
<view class="examine" @click="navigator(`/pages/admin/stockOut/index?mer_id=${mer_id}`)">
<!-- <view class="examine" @click="navigator(`/pages/admin/stockOut/index?mer_id=${mer_id}`)">
<image class="icon_img" src="@/static/images/index10.png" mode="aspectFit">
</image>
<text class="text">扫码出库</text>
</view>
</view> -->
<view class="examine"
@click="navigator(`/pages/nongKe/gather/select_warehouse?mer_id=${mer_id}&stype=2`)">
<image class="icon_img" src="@/static/images/index9.png" mode="aspectFit">
@ -358,7 +358,7 @@
<view class="examine" @click="navigator(`/pages/payment/qrcode`)">
<image class="icon_img" src="@/static/images/index24.png" mode="aspectFit">
</image>
<text class="text">面对面交易</text>
<text class="text">面对面收款</text>
</view>
@ -446,7 +446,7 @@
<view class="examine" @click="navigator(`/pages/payment/qrcode`)">
<image class="icon_img" src="@/static/images/index24.png" mode="aspectFit">
</image>
<text class="text">面对面交易</text>
<text class="text">面对面收款</text>
</view>
</view>
@ -713,7 +713,6 @@ export default {
created () { },
onLoad () {
this.Fheight = uni.getSystemInfoSync().windowHeight + 'px';
console.log(this.Fheight)
if(ENV!='prod') this.no_prod = true;
},
onShow () {
@ -728,8 +727,6 @@ export default {
this.codelist()
this.list()
},

2
pages/nongKe/gather/select_warehouse.vue
View File

@ -296,7 +296,7 @@
}
},
onShow() {
},
methods: {
addGoods(item={}) {

4
pages/payment/qrcode.vue
View File

@ -104,7 +104,9 @@
}
},
onLoad(opt) {
this.getQrcode(opt.mer_id)
let user = this.$store.state.app.userInfo;
if(typeof user =='string') user = JSON.parse(user);
this.getQrcode(user.service.mer_id)
},
methods: {
// 获取二维码

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

@ -641,7 +641,7 @@
}
if (!t.price || +t.price <= 0) showFlag = '零售价不能小于0';
if (!t.stock || +t.stock <= 0) showFlag = '库存不能小于0';
if (!t.cost || +t.cost <= 0) showFlag = '成本价不能小于0';
// if (!t.cost || +t.cost <= 0) showFlag = '成本价不能小于0';
})
if (showFlag) {
if (this.setFormData.spec_type == 1) showFlag += ', 请点击设置多规格设置';

2
pages/product/addGoods/secound.vue
View File

@ -274,7 +274,7 @@
if(userInfo?.mer_info?.type_code=="TypeSupplyChain" && (!postData.attrValue[0]?.procure_price||postData.attrValue[0]?.procure_price<=0) )return Toast('批发价不能小于0');
if(!postData.attrValue[0]?.price||postData.attrValue[0]?.price<=0)return Toast('零售价不能小于0');
if(!postData.stock||postData.stock<0)return Toast('库存不能小于0');
if(!postData.attrValue[0]?.cost||postData.attrValue[0]?.cost<=0)return Toast('成本价不能小于0');
// if(!postData.attrValue[0]?.cost||postData.attrValue[0]?.cost<=0)return Toast('成本价不能小于0');
// if(!postData.content.title||postData.content.title?.trim().length<=0)return Toast('请输入商品详情');
// if(!postData.content.image||postData.content.image?.length<=0)return Toast('请上传商品图片');
// return Toast('通过');