czg_team/cashier_wx
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复分销回显问题，修复部分问题

Browse Source
This commit is contained in:
YeMingfei666
2026-02-02 09:16:13 +08:00
parent a95d7ebf01
commit 6e2161fc5e
7 changed files with 249 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/config.js
View File

@@ -1,6 +1,6 @@
// const debug = process.env.NODE_ENV == 'development' ? true : false; // const debug = process.env.NODE_ENV == 'development' ? true : false;
// const debug = false; // false线上 true本地 // const debug = false; // false线上 true本地
const debug = false; // false线上 true本地 const debug = true; // false线上 true本地
let baseUrl = '' let baseUrl = ''
let baseUrlwws = '' let baseUrlwws = ''

2
distribution/index.vue
View File

@@ -2,7 +2,7 @@
<view> <view>
<up-navbar <up-navbar
bg-color="transparent" bg-color="transparent"
title="分销中心" title="全民股东"
@leftClick="back" @leftClick="back"
:fixed="true" :fixed="true"
></up-navbar> ></up-navbar>

435
distribution/shop-detail/components/share-popup.vue
View File

@@ -3,7 +3,8 @@
<view class="w-qrcode"> <view class="w-qrcode">
<w-qrcode :options="codeOptions" :opacity="0" ref="wQrcode" @generate="(e) => qrcodeResult(e)"></w-qrcode> <w-qrcode :options="codeOptions" :opacity="0" ref="wQrcode" @generate="(e) => qrcodeResult(e)"></w-qrcode>
</view> </view>
<up-popup :show="show" bgColor="transparent" :safeAreaInsetBottom="false" :closeOnClickOverlay="true" @close="close" mode="center"> <up-popup :duration="0" :show="show" bgColor="transparent" :safeAreaInsetBottom="false"
:closeOnClickOverlay="true" @close="close" mode="center">
<view class="box"> <view class="box">
<view class="info"> <view class="info">
<view class="u-flex justify-center"> <view class="u-flex justify-center">
@@ -25,12 +26,15 @@
ref="wQrcode" ref="wQrcode"
@generate="(e) => qrcodeResult(e)" @generate="(e) => qrcodeResult(e)"
></w-qrcode> --> ></w-qrcode> -->
<up-image width="322rpx" height="322rpx" :src="code"></up-image> <image :src="code" class="code"></image>
<!-- <up-image width="322rpx" mode="scaleToFill" height="322rpx" :src="code"></up-image> -->
</view> </view>
</view> </view>
<view class="footer-wrap"> <view class="footer-wrap">
<view class="confirm line" @click="save">保存图片</view> <view class="confirm line" @click="save">保存图片</view>
<ymf-share><view class="confirm">微信分享</view></ymf-share> <ymf-share>
<view class="confirm">微信分享</view>
</ymf-share>
</view> </view>
</view> </view>
</up-popup> </up-popup>
@@ -38,223 +42,252 @@
</template> </template>
<script setup> <script setup>
import { shareMixin, handleMixinOnLoad, returnQuery } from '@/utils/share.js'; import {
import ymfShare from '@/components/ymf-components/ymf-share.vue'; shareMixin,
import wQrcode from '@/uni_modules/wmf-code/components/w-qrcode/w-qrcode.vue'; handleMixinOnLoad,
import { desensitizePhone } from '@/utils/util.js'; returnQuery
import { ref, onMounted, nextTick } from 'vue'; } from '@/utils/share.js';
import ymfShare from '@/components/ymf-components/ymf-share.vue';
import wQrcode from '@/uni_modules/wmf-code/components/w-qrcode/w-qrcode.vue';
import {
desensitizePhone
} from '@/utils/util.js';
import {
ref,
onMounted,
nextTick
} from 'vue';
onMounted(async () => { onMounted(async () => {
setTimeout(async () => { setTimeout(async () => {
await nextTick(); await nextTick();
const query = await returnQuery(); const query = await returnQuery();
codeOptions.value.code = `https://cashier.sxczgkj.com/invite?${removeQAndAfter(query)}`; codeOptions.value.code =
console.log('codeOptions.value', codeOptions.value); `https://cashier.sxczgkj.com/invite?${removeQAndAfter(query)}`;
}, 500); console.log('codeOptions.value', codeOptions.value);
}); }, 500);
});
/** /**
* 截取字符串，移除 &q 及后面的所有内容 * 截取字符串，移除 &q 及后面的所有内容
* @param {string} str - 原始字符串 * @param {string} str - 原始字符串
* @returns {string} 处理后的字符串 * @returns {string} 处理后的字符串
*/ */
function removeQAndAfter(str) { function removeQAndAfter(str) {
// 检查是否为空字符串 // 检查是否为空字符串
if (!str || typeof str !== 'string') { if (!str || typeof str !== 'string') {
return str || ''; return str || '';
}
// 找到 &q 的起始位置
const qIndex = str.indexOf('&q');
// 如果找到 &q，截取前面的部分；否则返回原字符串
return qIndex !== -1 ? str.slice(0, qIndex) : str;
} }
// 找到 &q 的起始位置 const props = defineProps({
const qIndex = str.indexOf('&q'); inviteCode: {
type: String,
// 如果找到 &q，截取前面的部分；否则返回原字符串 default: ''
return qIndex !== -1 ? str.slice(0, qIndex) : str; },
} shopUserInfo: {
type: Object,
const props = defineProps({ default: () => {}
inviteCode: {
type: String,
default: ''
},
shopUserInfo: {
type: Object,
default: () => {}
}
});
const codeOptions = ref({
padding: 10,
size: 200,
code: ''
});
function copyCode() {
uni.setClipboardData({
data: props.inviteCode,
success: function () {
console.log('success');
} }
}); });
}
const code = ref('');
function qrcodeResult(e) { const codeOptions = ref({
console.log('qrcodeResult', e); padding: 10,
code.value = e.img.tempFilePath; size: 200,
console.log('code', code.value); code: ''
} });
const show = defineModel({ function copyCode() {
type: Boolean, uni.setClipboardData({
default: false data: props.inviteCode,
}); success: function() {
const emits = defineEmits(['cancel', 'confirm']); console.log('success');
function close() { }
show.value = false; });
emits('cancel'); }
} const code = ref('');
function save() {
show.value = false;
// 保存图片到相册 function qrcodeResult(e) {
uni.saveImageToPhotosAlbum({ console.log('qrcodeResult', e);
filePath: code.value, code.value = e.img.tempFilePath;
success: function () { console.log('code', code.value);
uni.showToast({ }
title: '保存成功',
icon: 'none' const show = defineModel({
}); type: Boolean,
}, default: false
fail: function (err) { });
console.log('保存失败原因：', err); const emits = defineEmits(['cancel', 'confirm']);
// 判断是否为授权拒绝（微信小程序授权拒绝的特征）
if (err.errMsg.includes('auth deny') || err.errMsg.includes('authorize fail')) { function close() {
// 弹出提示引导用户去设置页开启授权 show.value = false;
uni.showModal({ emits('cancel');
title: '授权提示', }
content: '保存图片需要授权访问相册，请前往设置开启授权',
showCancel: true, function save() {
cancelText: '取消', show.value = false;
confirmText: '去设置',
success: function (res) { // 保存图片到相册
if (res.confirm) { uni.saveImageToPhotosAlbum({
// 跳转到微信小程序的授权设置页 filePath: code.value,
uni.openSetting({ success: function() {
success: function (settingRes) { uni.showToast({
// 检查用户是否开启了相册授权 title: '保存成功',
if (settingRes.authSetting['scope.writePhotosAlbum']) { icon: 'none'
});
},
fail: function(err) {
console.log('保存失败原因：', err);
// 判断是否为授权拒绝（微信小程序授权拒绝的特征）
if (err.errMsg.includes('auth deny') || err.errMsg.includes('authorize fail')) {
// 弹出提示引导用户去设置页开启授权
uni.showModal({
title: '授权提示',
content: '保存图片需要授权访问相册，请前往设置开启授权',
showCancel: true,
cancelText: '取消',
confirmText: '去设置',
success: function(res) {
if (res.confirm) {
// 跳转到微信小程序的授权设置页
uni.openSetting({
success: function(settingRes) {
// 检查用户是否开启了相册授权
if (settingRes.authSetting[
'scope.writePhotosAlbum']) {
uni.showToast({
title: '授权成功，可重新保存',
icon: 'none'
});
} else {
uni.showToast({
title: '未开启授权，保存失败',
icon: 'none'
});
}
},
fail: function() {
uni.showToast({ uni.showToast({
title: '授权成功，可重新保存', title: '打开设置失败',
icon: 'none'
});
} else {
uni.showToast({
title: '未开启授权，保存失败',
icon: 'none' icon: 'none'
}); });
} }
}, });
fail: function () { }
uni.showToast({
title: '打开设置失败',
icon: 'none'
});
}
});
} }
} });
}); } else {
} else { // 非授权问题的保存失败（如文件路径错误、系统问题等）
// 非授权问题的保存失败（如文件路径错误、系统问题等） uni.showToast({
uni.showToast({ title: '保存失败',
title: '保存失败', icon: 'none'
icon: 'none' });
}); }
} }
} });
});
emits('confirm', code.value); emits('confirm', code.value);
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
:deep(.info .canvas) { :deep(.info .canvas) {
opacity: 1; opacity: 1;
}
.border {
border: 2rpx solid #d9d9d9;
padding: 18rpx;
border-radius: 4rpx;
}
.box {
width: 638rpx;
background-color: #fff;
border-radius: 16rpx;
// overflow: hidden;
position: relative;
.title {
color: #000000;
font-size: 32rpx;
font-weight: 700;
} }
.top {
border-bottom: 2rpx solid #ededed;
}
.info {
padding: 96rpx 40rpx 96rpx 40rpx;
font-size: 28rpx;
}
.small-title {
min-width: 84rpx;
text-align: right;
}
.footer-wrap {
width: 100%;
position: absolute;
left: 0;
bottom: -100upx;
display: flex;
gap: 28upx;
}
}
.cancel { .border {
padding: 14rpx 76rpx; border: 2rpx solid #d9d9d9;
border-radius: 36rpx; padding: 18rpx;
border: 2rpx solid #e8ad7b; border-radius: 4rpx;
color: #e8ad7b;
font-size: 32rpx;
font-weight: 400;
white-space: nowrap;
line-height: 48rpx;
}
.confirm {
$color: #e8ad7b;
flex: 1;
padding: 14rpx 76rpx;
border-radius: 16rpx;
background-color: $color;
border: 2rpx solid $color;
color: #fff;
font-size: 32rpx;
font-weight: 400;
white-space: nowrap;
display: flex;
justify-content: center;
align-items: center;
&.line {
background-color: #fff;
color: $color;
} }
}
.line-height-54 { .box {
line-height: 54rpx; width: 638rpx;
} background-color: #fff;
.w-qrcode { border-radius: 16rpx;
position: fixed; // overflow: hidden;
left: -9999px; position: relative;
top: -9999px;
z-index: -1; .title {
} color: #000000;
</style> font-size: 32rpx;
font-weight: 700;
}
.top {
border-bottom: 2rpx solid #ededed;
}
.info {
padding: 96rpx 40rpx 96rpx 40rpx;
font-size: 28rpx;
}
.small-title {
min-width: 84rpx;
text-align: right;
}
.footer-wrap {
width: 100%;
position: absolute;
left: 0;
bottom: -100upx;
display: flex;
gap: 28upx;
}
}
.cancel {
padding: 14rpx 76rpx;
border-radius: 36rpx;
border: 2rpx solid #e8ad7b;
color: #e8ad7b;
font-size: 32rpx;
font-weight: 400;
white-space: nowrap;
line-height: 48rpx;
}
.confirm {
$color: #e8ad7b;
flex: 1;
padding: 14rpx 76rpx;
border-radius: 16rpx;
background-color: $color;
border: 2rpx solid $color;
color: #fff;
font-size: 32rpx;
font-weight: 400;
white-space: nowrap;
display: flex;
justify-content: center;
align-items: center;
&.line {
background-color: #fff;
color: $color;
}
}
.line-height-54 {
line-height: 54rpx;
}
.w-qrcode {
position: fixed;
left: -9999px;
top: -9999px;
z-index: -1;
}
.code{
width: 322rpx;
height: 322rpx;
}
</style>

14
distribution/shop-detail/index.vue
View File

@@ -1,6 +1,6 @@
<template> <template>
<view class="min-h-100vh bg-gray"> <view class="min-h-100vh bg-gray">
<up-navbar bg-color="transparent" title="分销中心" @leftClick="back" :fixed="true"></up-navbar> <up-navbar bg-color="transparent" title="全民股东" @leftClick="back" :fixed="true"></up-navbar>
<view class="top"> <view class="top">
<image class="top_bg" src="/distribution/static/top_bg.png" :style="imageStyle"></image> <image class="top_bg" src="/distribution/static/top_bg.png" :style="imageStyle"></image>
<view class="box" :class="{ type1: isActivated }"> <view class="box" :class="{ type1: isActivated }">
@@ -10,10 +10,10 @@
<text class="u-m-l-14 font-14 color-333 font-700">{{ state.shopName }}</text> <text class="u-m-l-14 font-14 color-333 font-700">{{ state.shopName }}</text>
</view> </view>
<view> <view>
<template v-if="state.parentPhone"> <template v-if="state.parentPhone||state.parentName ">
<view class="font-12 color-666">上级：{{ state.parentName }}{{ state.parentPhone }}</view> <view class="font-12 color-666">上级：{{ state.parentName }}{{ state.parentPhone }}</view>
</template> </template>
<template v-if="!state.parentPhone"> <template v-else>
<view class="bind" @click="showBindShangji = true">绑定上级</view> <view class="bind" @click="showBindShangji = true">绑定上级</view>
</template> </template>
</view> </view>
@@ -499,7 +499,7 @@
totalPage: 0 totalPage: 0
}); });
async function getRecoders() { async function getRecoders() {
if (state.config) return; // if (state.config) return;
const ajaxQuery = { const ajaxQuery = {
...query, ...query,
shopId: options.shopId shopId: options.shopId
@@ -562,6 +562,9 @@
const showInviteCode = computed(() => { const showInviteCode = computed(() => {
if (config.upgradeType == 'invite') { if (config.upgradeType == 'invite') {
if(config.openType=='pay'&&!isActivated.value){
return false
}
return true; return true;
} }
if (config.openType == 'manual' && (!state.distributionUser || !state.distributionUser.level)) { if (config.openType == 'manual' && (!state.distributionUser || !state.distributionUser.level)) {
@@ -576,12 +579,13 @@
if (!state.distributionUser && config.openType == 'manual') { if (!state.distributionUser && config.openType == 'manual') {
return true; return true;
} }
return false; return false;
}); });
//是否已成为分销员 //是否已成为分销员
const isActivated = computed(() => { const isActivated = computed(() => {
return state.distributionUser && state.distributionUser.level; return (state.distributionUser && state.distributionUser.level)?true:false;
}); });
watch( watch(
() => activeTab.value, () => activeTab.value,

4
pages.json
View File

@@ -258,7 +258,7 @@
"pages": [{ "pages": [{
"path": "index", "path": "index",
"style": { "style": {
"navigationBarTitleText": "分销中心", "navigationBarTitleText": "全民股东",
"navigationStyle": "custom" "navigationStyle": "custom"
} }
}, },
@@ -278,7 +278,7 @@
{ {
"path": "shop-detail/index", "path": "shop-detail/index",
"style": { "style": {
"navigationBarTitleText": "分销中心", "navigationBarTitleText": "全民股东",
"navigationStyle": "custom" "navigationStyle": "custom"
} }
}, },

2
pages/product/index.vue
View File

@@ -2504,7 +2504,7 @@
console.log('options.initMessage', options.initMessage) console.log('options.initMessage', options.initMessage)
const newTableCode = userStore.getQueryString(res.result, 'code'); const newTableCode = userStore.getQueryString(res.result, 'code');
console.log('newTableCode',newTableCode);
const shopInfoRes = await APIproductqueryShop({ const shopInfoRes = await APIproductqueryShop({
tableCode: newTableCode tableCode: newTableCode
}); });

2
pages/user/user.vue
View File

@@ -232,7 +232,7 @@ const myFunList = ref([
icon: 'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/my_coupon.png' icon: 'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/my_coupon.png'
}, },
{ {
name: '分销', name: '全民股东',
type: 'fenxiao', type: 'fenxiao',
icon: '/static/icon/fenxiao.svg' icon: '/static/icon/fenxiao.svg'
}, },