Compare commits
33 Commits
custom/281
...
custom/com
| Author | SHA1 | Date | |
|---|---|---|---|
| 23c954981b | |||
| aa2f13f3b2 | |||
| 09c49365a3 | |||
| 40c1d27f02 | |||
| ae5577c0ee | |||
| 04d045e81e | |||
| 30fef9770a | |||
| 3f666a5e83 | |||
| 94c9d1c556 | |||
| 3acd3870b6 | |||
| bec0a51d81 | |||
| d744e1c16d | |||
| 6a1bf3b5bc | |||
| 526de0d73f | |||
| dcf3703892 | |||
| 6894950b7e | |||
| 781bb8845e | |||
| b70725c104 | |||
| 8dce1058f6 | |||
| 6b6c50ebb8 | |||
| b079487c9a | |||
| ef7b609efb | |||
| 7a28bb7f7a | |||
| 921e8b79b1 | |||
| 0101c36012 | |||
| 469bc4da81 | |||
| 50072c45ab | |||
| c790d63005 | |||
| 71c866c0f8 | |||
| a5740f53af | |||
| 8f0a13c473 | |||
| 6d0c914e79 | |||
| 3fec0470cf |
@@ -61,8 +61,8 @@ export default {
|
|||||||
groupby_promotion_aux_color: '#F7B500',//活动辅色
|
groupby_promotion_aux_color: '#F7B500',//活动辅色
|
||||||
},
|
},
|
||||||
...{
|
...{
|
||||||
hover_nav_bg_color: '#FFFC', //背景色: 红色 '#c6251b', 白色: '#FFFC'
|
hover_nav_bg_color: '#c6251b', //背景色: 红色 '#c6251b', 白色: '#FFFC'
|
||||||
hover_nav_text_color: '#000' // 文字颜色: 白色 '#FFFFFF', 黑色: '#000'
|
hover_nav_text_color: '#FFFFFF' // 文字颜色: 白色 '#FFFFFF', 黑色: '#000'
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
'green': {
|
'green': {
|
||||||
|
|||||||
@@ -1162,5 +1162,47 @@ export default {
|
|||||||
verifyMobile(mobile) {
|
verifyMobile(mobile) {
|
||||||
var parse = /^\d{11}$/.test(mobile);
|
var parse = /^\d{11}$/.test(mobile);
|
||||||
return parse;
|
return parse;
|
||||||
|
},
|
||||||
|
/**
|
||||||
|
* 判断是否为快应用环境
|
||||||
|
* @returns {boolean} 是否为快应用
|
||||||
|
*/
|
||||||
|
isQuickApp() {
|
||||||
|
// #ifndef QUICKAPP-WEBVIEW
|
||||||
|
let _isQuickApp = false;
|
||||||
|
try {
|
||||||
|
const ua = navigator?.userAgent?.toLowerCase();
|
||||||
|
console.log('ua = ', ua);
|
||||||
|
_isQuickApp = ua.indexOf('quickapp') !== -1;
|
||||||
|
|
||||||
|
if (!_isQuickApp) {
|
||||||
|
// 特殊说明由于网站是嵌入到快应用的Webview组件中<web>,UA中不会包含quickapp字符串,
|
||||||
|
// 但是会包含uniacid参数,所以这里通过uniacid参数来判断是否为快应用环境
|
||||||
|
_isQuickApp = ua.indexOf('uniacid=') !== -1;
|
||||||
|
}
|
||||||
|
} catch (e) {}
|
||||||
|
|
||||||
|
if (!_isQuickApp) {
|
||||||
|
const systemInfo = this.getDeviceInfo();
|
||||||
|
_isQuickApp = systemInfo?.platform === 'quickapp' || process?.env?.UNI_PLATFORM === 'quickapp';
|
||||||
|
}
|
||||||
|
return _isQuickApp;
|
||||||
|
// #endif
|
||||||
|
|
||||||
|
return true;
|
||||||
|
},
|
||||||
|
/**
|
||||||
|
* 判断是否为华为快应用环境
|
||||||
|
* @returns {boolean} 是否为华为快应用
|
||||||
|
*/
|
||||||
|
isHuaweiQuickApp() {
|
||||||
|
if (!this.isQuickApp()) return false;
|
||||||
|
|
||||||
|
// #ifndef QUICKAPP-WEBVIEW-HUAWEI
|
||||||
|
const systemInfo = this.getDeviceInfo();
|
||||||
|
return systemInfo.brand === 'HUAWEI' || systemInfo.manufacturer === 'HUAWEI' ||
|
||||||
|
(typeof qh !== 'undefined' && qh.platform === 'huawei');
|
||||||
|
// #endif
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,237 +1,385 @@
|
|||||||
<template>
|
<template>
|
||||||
<!-- #ifdef MP -->
|
<view>
|
||||||
<view v-if="showPop">
|
<view class="privacy-mask" v-if="showPop">
|
||||||
<view class="privacy-mask">
|
|
||||||
<view class="privacy-wrap">
|
<view class="privacy-wrap">
|
||||||
<view class="privacy-title">用户隐私保护提示</view>
|
<view class="privacy-title">用户隐私保护提示</view>
|
||||||
<view class="privacy-desc">
|
<view class="privacy-desc">
|
||||||
感谢您使用本小程序,在使用前您应当阅读并同意
|
感谢您使用{{ appName }},在使用前您应当阅读并同意
|
||||||
<text class="privacy-link" @tap="openPrivacyContract">{{privacyContractName}}</text>,
|
<text class="privacy-link" @tap="openPrivacyContract">{{ privacyContractName }}</text>
|
||||||
当点击同意并继续时,即表示您已理解并同意该条款内容,该条款将对您产生法律约束力;如您不同意,将无法继续使用小程序相关功能。
|
<!-- #ifdef QUICKAPP-WEBVIEW || H5 -->
|
||||||
|
<text class="privacy-link" @tap="openPrivacyService">{{ privacyServiceName }}</text>
|
||||||
|
<!-- #endif -->
|
||||||
|
,当点击同意并继续时,即表示您已理解并同意该条款内容,该条款将对您产生法律约束力;如您不同意,将无法继续使用{{ appName }}相关功能。
|
||||||
</view>
|
</view>
|
||||||
<view class="privacy-button-flex">
|
<view class="privacy-button-flex">
|
||||||
<button class="privacy-button-btn bg-disagree" @tap="handleDisagree">不同意</button>
|
<button class="privacy-button-btn bg-disagree" @tap="handleDisagree">不同意</button>
|
||||||
<button id="agree-btn" class="privacy-button-btn bg-agree" open-type="agreePrivacyAuthorization" @agreeprivacyauthorization="handleAgree">同意并继续</button>
|
<!-- #ifdef QUICKAPP-WEBVIEW || MP-WEIXIN -->
|
||||||
|
<button id="agree-btn" class="privacy-button-btn bg-agree" open-type="agreePrivacyAuthorization"
|
||||||
|
@agreeprivacyauthorization="handleAgree">同意并继续</button>
|
||||||
|
<!-- #endif -->
|
||||||
|
<!-- #ifdef WEB || H5 -->
|
||||||
|
<button id="agree-btn" class="privacy-button-btn bg-agree" @tap="handleAgree" @click="handleAgree">同意并继续</button>
|
||||||
|
<!-- #endif -->
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<!-- #endif -->
|
|
||||||
<!-- #ifdef WEB || H5 -->
|
|
||||||
<view v-if="showPop"></view>
|
|
||||||
<!-- #endif -->
|
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
export default {
|
// #ifdef QUICKAPP-WEBVIEW
|
||||||
data() {
|
import has from '@system.has'
|
||||||
return {
|
// #endif
|
||||||
agree: false,
|
|
||||||
showPop: false,
|
const closeOtherPagePopUpHooks = new Set();
|
||||||
privacyAuthorization: null,
|
const privacyContractPage = '/pages_tool/agreement/contenr?type=0';
|
||||||
privacyResolves: new Set(),
|
const privacyServicePage = '/pages_tool/agreement/contenr?type=1';
|
||||||
closeOtherPagePopUpHooks: new Set(),
|
|
||||||
privacyContractName: '用户隐私保护指引'
|
export default {
|
||||||
}
|
name: 'PrivacyPopup',
|
||||||
},
|
data() {
|
||||||
mounted() {
|
return {
|
||||||
this.init()
|
agree: false,
|
||||||
this.curPageShow()
|
showPop: false,
|
||||||
},
|
privacyAuthorization: null,
|
||||||
created() {
|
privacyResolves: new Set(),
|
||||||
let that = this
|
privacyContractName: '用户隐私保护指引',
|
||||||
|
appName: '本小程序',
|
||||||
|
// #ifdef WEB || H5
|
||||||
|
appName: '本应用',
|
||||||
|
privacyContractName: '《隐私条款》',
|
||||||
|
privacyServiceName: '《用户服务协议》',
|
||||||
|
// #endif
|
||||||
|
}
|
||||||
|
},
|
||||||
|
mounted() {
|
||||||
|
this.listenPrivacySettingChange()
|
||||||
|
this.curPageShow()
|
||||||
|
},
|
||||||
|
created() {
|
||||||
|
try {
|
||||||
|
// #ifdef MP-WEIXIN
|
||||||
//查询微信侧记录的用户是否有待同意的隐私政策信息
|
//查询微信侧记录的用户是否有待同意的隐私政策信息
|
||||||
try {
|
wx.getPrivacySetting({
|
||||||
wx.getPrivacySetting({
|
success: (res) => {
|
||||||
success(res) {
|
// console.log('隐私政策信息', res);
|
||||||
// console.log('隐私政策信息', res);
|
// console.log(res.privacyContractName);
|
||||||
// console.log(res.privacyContractName);
|
this.privacyContractName = res.privacyContractName
|
||||||
that.privacyContractName = res.privacyContractName
|
}
|
||||||
}
|
});
|
||||||
});
|
// #endif
|
||||||
} catch (e) {
|
|
||||||
// console.log("=========低版本基础库==========")
|
// #ifdef QUICKAPP-WEBVIEW || H5
|
||||||
}
|
if (this.$util.isQuickApp()) {
|
||||||
},
|
if (typeof has != 'undefined' && has?.getPrivacySetting) {
|
||||||
methods: {
|
has.getPrivacySetting({
|
||||||
// 监听何时需要提示用户阅读隐私政策
|
success: (res) => {
|
||||||
init() {
|
if (res.privacyContractName) {
|
||||||
let that = this;
|
this.privacyContractName = res.privacyContractName
|
||||||
if (wx.onNeedPrivacyAuthorization) {
|
}
|
||||||
wx.onNeedPrivacyAuthorization((resolve) => {
|
},
|
||||||
if (typeof that.privacyAuthorization === 'function') {
|
|
||||||
that.privacyAuthorization(resolve)
|
|
||||||
}
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
},
|
}
|
||||||
proactive() {
|
// #endif
|
||||||
let that = this
|
} catch (e) {
|
||||||
if (wx.getPrivacySetting) {
|
console.error("=========低版本基础库==========", e)
|
||||||
wx.getPrivacySetting({
|
}
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
getPrivacySettingByQuickApp() {
|
||||||
|
// #ifdef QUICKAPP-WEBVIEW || H5 || WEB
|
||||||
|
if (this.$util.isQuickApp()) {
|
||||||
|
if (typeof has != 'undefined' && has?.getPrivacySetting) {
|
||||||
|
has.getPrivacySetting({
|
||||||
success: (res) => {
|
success: (res) => {
|
||||||
// console.log(res)
|
// console.log(res)
|
||||||
if (res.needAuthorization) {
|
if (res.needAuthorization) {
|
||||||
that.popUp()
|
this.popUp()
|
||||||
// 额外逻辑:当前页面的隐私弹窗弹起的时候,关掉其他页面的隐私弹窗
|
// 额外逻辑:当前页面的隐私弹窗弹起的时候,关掉其他页面的隐私弹窗
|
||||||
this.closeOtherPagePopUp(this.disPopUp)
|
this.closeOtherPagePopUp(this.disPopUp)
|
||||||
} else {
|
} else {
|
||||||
this.$emit('agree')
|
this.$emit('agree')
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
// 属于嵌入到快应用Webview组件中的情况,按照H5的方式来处理,判断是否已经授权
|
||||||
|
if (uni.getStorageSync('privacyAgreed')) {
|
||||||
|
this.$emit('agree')
|
||||||
|
} else {
|
||||||
|
this.popUp()
|
||||||
|
// 额外逻辑:当前页面的隐私弹窗弹起的时候,关掉其他页面的隐私弹窗
|
||||||
|
this.closeOtherPagePopUp(this.disPopUp)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// #endif
|
||||||
|
},
|
||||||
|
|
||||||
|
listenPrivacySettingChange() {
|
||||||
|
// #ifdef MP-WEIXIN
|
||||||
|
// 监听微信侧隐私政策授权变化事件
|
||||||
|
if (wx.onNeedPrivacyAuthorization) {
|
||||||
|
wx.onNeedPrivacyAuthorization((resolve) => {
|
||||||
|
if (typeof this.privacyAuthorization === 'function') {
|
||||||
|
this.privacyAuthorization(resolve)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
// #endif
|
||||||
|
|
||||||
|
// #ifdef QUICKAPP-WEBVIEW || H5 || WEB
|
||||||
|
if (this.$util.isQuickApp()) {
|
||||||
|
// 监听快速应用侧隐私政策授权变化事件
|
||||||
|
if (typeof has != 'undefined' && has?.onPrivacySettingChange) {
|
||||||
|
has.onPrivacySettingChange((res) => {
|
||||||
|
// console.log(res)
|
||||||
|
if (res.needAuthorization) {
|
||||||
|
this.popUp()
|
||||||
|
// 额外逻辑:当前页面的隐私弹窗弹起的时候,关掉其他页面的隐私弹窗
|
||||||
|
this.closeOtherPagePopUp(this.disPopUp)
|
||||||
|
} else {
|
||||||
|
this.$emit('agree')
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// #endif
|
||||||
|
|
||||||
|
// 主动查询用户隐私政策授权状态,针对快速应用
|
||||||
|
this.getPrivacySettingByQuickApp();
|
||||||
|
},
|
||||||
|
// 主动查询用户隐私政策授权状态
|
||||||
|
proactive() {
|
||||||
|
// #ifdef MP-WEIXIN
|
||||||
|
if (wx.getPrivacySetting) {
|
||||||
|
wx.getPrivacySetting({
|
||||||
|
success: (res) => {
|
||||||
|
// console.log(res)
|
||||||
|
if (res.needAuthorization) {
|
||||||
|
this.popUp()
|
||||||
|
// 额外逻辑:当前页面的隐私弹窗弹起的时候,关掉其他页面的隐私弹窗
|
||||||
|
this.closeOtherPagePopUp(this.disPopUp)
|
||||||
|
} else {
|
||||||
|
this.$emit('agree')
|
||||||
|
}
|
||||||
|
},
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
this.$emit('agree')
|
||||||
|
}
|
||||||
|
// #endif
|
||||||
|
|
||||||
|
// #ifdef QUICKAPP-WEBVIEW
|
||||||
|
this.getPrivacySettingByQuickApp();
|
||||||
|
// #endif
|
||||||
|
},
|
||||||
|
//初始化监听程序
|
||||||
|
curPageShow() {
|
||||||
|
closeOtherPagePopUpHooks.add(this.disPopUp)
|
||||||
|
this.privacyAuthorization = resolve => {
|
||||||
|
this.privacyResolves.add(resolve)
|
||||||
|
//打开弹窗
|
||||||
|
this.popUp()
|
||||||
|
// 额外逻辑:当前页面的隐私弹窗弹起的时候,关掉其他页面的隐私弹窗
|
||||||
|
this.closeOtherPagePopUp(this.disPopUp)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
// 额外逻辑:当前页面的隐私弹窗弹起的时候,关掉其他页面的隐私弹窗
|
||||||
|
closeOtherPagePopUp(closePopUp) {
|
||||||
|
closeOtherPagePopUpHooks.forEach(hook => {
|
||||||
|
if (closePopUp !== hook) {
|
||||||
|
hook()
|
||||||
|
}
|
||||||
|
})
|
||||||
|
},
|
||||||
|
//打开隐私协议
|
||||||
|
openPrivacyContract() {
|
||||||
|
// #ifdef MP-WEIXIN
|
||||||
|
wx.openPrivacyContract({
|
||||||
|
success(res) {
|
||||||
|
// console.log('打开隐私协议', res);
|
||||||
|
},
|
||||||
|
fail(err) {
|
||||||
|
// console.error('打开隐私协议失败', err)
|
||||||
|
}
|
||||||
|
});
|
||||||
|
// #endif
|
||||||
|
|
||||||
|
// #ifdef QUICKAPP-WEBVIEW || H5 || WEB
|
||||||
|
if (this.$util.isQuickApp()) {
|
||||||
|
if (typeof has != 'undefined' && has?.openPrivacySetting) {
|
||||||
|
has.openPrivacySetting({
|
||||||
|
success: (res) => {
|
||||||
|
// console.log('打开隐私协议', res);
|
||||||
|
},
|
||||||
|
fail: (err) => {
|
||||||
|
// console.error('打开隐私协议失败', err)
|
||||||
|
}
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
this.$emit('agree')
|
// 属于嵌入到快应用Webview组件中的情况,按照H5的方式来处理
|
||||||
|
this.$util.redirectTo(privacyContractPage);
|
||||||
}
|
}
|
||||||
},
|
} else {
|
||||||
//初始化监听程序
|
// H5 环境下的处理逻辑
|
||||||
curPageShow() {
|
this.$util.redirectTo(privacyContractPage);
|
||||||
this.privacyAuthorization = resolve => {
|
}
|
||||||
this.privacyResolves.add(resolve)
|
// #endif
|
||||||
//打开弹窗
|
},
|
||||||
this.popUp()
|
//打开用户服务协议
|
||||||
// 额外逻辑:当前页面的隐私弹窗弹起的时候,关掉其他页面的隐私弹窗
|
openPrivacyService() {
|
||||||
this.closeOtherPagePopUp(this.disPopUp)
|
// #ifdef QUICKAPP-WEBVIEW || H5 || WEB
|
||||||
|
if (this.$util.isQuickApp()) {
|
||||||
|
if (typeof has != 'undefined' && has?.openPrivacySetting) {
|
||||||
|
has.openPrivacySetting({
|
||||||
|
success: (res) => {
|
||||||
|
// console.log('打开用户服务协议', res);
|
||||||
|
},
|
||||||
|
fail: (err) => {
|
||||||
|
// console.error('打开用户服务协议失败', err)
|
||||||
|
}
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
// 属于嵌入到快应用Webview组件中的情况,按照H5的方式来处理
|
||||||
|
this.$util.redirectTo(privacyServicePage);
|
||||||
}
|
}
|
||||||
this.closeOtherPagePopUpHooks.add(this.disPopUp)
|
} else {
|
||||||
},
|
// H5 环境下的处理逻辑
|
||||||
// 额外逻辑:当前页面的隐私弹窗弹起的时候,关掉其他页面的隐私弹窗
|
this.$util.redirectTo(privacyServicePage);
|
||||||
closeOtherPagePopUp(closePopUp) {
|
}
|
||||||
this.closeOtherPagePopUpHooks.forEach(hook => {
|
// #endif
|
||||||
if (closePopUp !== hook) {
|
},
|
||||||
hook()
|
// 不同意
|
||||||
}
|
handleDisagree() {
|
||||||
|
this.privacyResolves.forEach(resolve => {
|
||||||
|
resolve({
|
||||||
|
event: 'disagree',
|
||||||
})
|
})
|
||||||
},
|
})
|
||||||
//打开隐私协议
|
this.privacyResolves.clear()
|
||||||
openPrivacyContract() {
|
|
||||||
wx.openPrivacyContract({
|
|
||||||
success(res) {
|
|
||||||
// console.log('打开隐私协议', res);
|
|
||||||
},
|
|
||||||
fail(err) {
|
|
||||||
// console.error('打开隐私协议失败', err)
|
|
||||||
}
|
|
||||||
});
|
|
||||||
},
|
|
||||||
// 不同意
|
|
||||||
handleDisagree() {
|
|
||||||
this.privacyResolves.forEach(resolve => {
|
|
||||||
resolve({
|
|
||||||
event: 'disagree',
|
|
||||||
})
|
|
||||||
})
|
|
||||||
this.privacyResolves.clear()
|
|
||||||
//关闭弹窗
|
|
||||||
this.disPopUp()
|
|
||||||
//退出小程序
|
|
||||||
uni.showModal({
|
|
||||||
content: '未同意隐私协议,无法使用相关功能',
|
|
||||||
success: () => {
|
|
||||||
this.$emit('disagree')
|
|
||||||
}
|
|
||||||
})
|
|
||||||
},
|
|
||||||
// 同意并继续
|
|
||||||
handleAgree() {
|
|
||||||
this.privacyResolves.forEach(resolve => {
|
|
||||||
resolve({
|
|
||||||
event: 'agree',
|
|
||||||
buttonId: 'agree-btn'
|
|
||||||
})
|
|
||||||
})
|
|
||||||
this.privacyResolves.clear()
|
|
||||||
//关闭弹窗
|
|
||||||
this.disPopUp()
|
|
||||||
this.$emit('agree')
|
|
||||||
},
|
|
||||||
//打开弹窗
|
|
||||||
popUp() {
|
|
||||||
if (this.showPop === false) {
|
|
||||||
this.showPop = true
|
|
||||||
}
|
|
||||||
},
|
|
||||||
//关闭弹窗
|
//关闭弹窗
|
||||||
disPopUp() {
|
this.disPopUp()
|
||||||
if (this.showPop === true) {
|
//退出小程序
|
||||||
this.showPop = false
|
uni.showModal({
|
||||||
|
content: '未同意隐私协议,无法使用相关功能',
|
||||||
|
success: () => {
|
||||||
|
this.$emit('disagree')
|
||||||
}
|
}
|
||||||
},
|
})
|
||||||
}
|
},
|
||||||
}
|
// 同意并继续
|
||||||
|
handleAgree() {
|
||||||
|
this.privacyResolves.forEach(resolve => {
|
||||||
|
resolve({
|
||||||
|
event: 'agree',
|
||||||
|
buttonId: 'agree-btn'
|
||||||
|
})
|
||||||
|
})
|
||||||
|
this.privacyResolves.clear()
|
||||||
|
//关闭弹窗
|
||||||
|
this.disPopUp()
|
||||||
|
|
||||||
|
// #ifdef QUICKAPP-WEBVIEW || H5 || WEB
|
||||||
|
// 保存用户授权状态到本地存储,用于快应用Webview组件中的H5方式处理
|
||||||
|
uni.setStorageSync('privacyAgreed', true);
|
||||||
|
// #endif
|
||||||
|
this.$emit('agree')
|
||||||
|
},
|
||||||
|
//打开弹窗
|
||||||
|
popUp() {
|
||||||
|
this.showPop = true;
|
||||||
|
},
|
||||||
|
//关闭弹窗
|
||||||
|
disPopUp() {
|
||||||
|
this.showPop = false;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
beforeDestroy() {
|
||||||
|
// 清理事件监听器和集合
|
||||||
|
this.privacyResolves.clear()
|
||||||
|
closeOtherPagePopUpHooks.delete(this.disPopUp)
|
||||||
|
// 注意:这里需要根据实际情况清理微信和快速应用的事件监听器
|
||||||
|
// 由于微信的 wx.onNeedPrivacyAuthorization 没有对应的 off 方法,这里可能需要其他方式处理
|
||||||
|
},
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.privacy-mask {
|
.privacy-mask {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
z-index: 5000;
|
z-index: 5000;
|
||||||
top: 0;
|
top: 0;
|
||||||
right: 0;
|
right: 0;
|
||||||
left: 0;
|
left: 0;
|
||||||
bottom: 0;
|
bottom: 0;
|
||||||
background: rgba(0, 0, 0, 0.2);
|
background: rgba(0, 0, 0, 0.2);
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
.privacy-wrap {
|
.privacy-wrap {
|
||||||
width: 632rpx;
|
width: 632rpx;
|
||||||
padding: 48rpx 30rpx;
|
padding: 48rpx 30rpx;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
background: #fff;
|
background: #fff;
|
||||||
border-radius: 16rpx;
|
border-radius: 16rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.privacy-title {
|
.privacy-title {
|
||||||
padding: 0rpx 30rpx 40rpx 30rpx;
|
padding: 0rpx 30rpx 40rpx 30rpx;
|
||||||
font-weight: 700;
|
font-weight: 700;
|
||||||
font-size: 36rpx;
|
font-size: 36rpx;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
.privacy-desc {
|
.privacy-desc {
|
||||||
font-size: 30rpx;
|
font-size: 30rpx;
|
||||||
color: #555;
|
color: #555;
|
||||||
line-height: 2;
|
line-height: 2;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
padding: 0 40rpx;
|
padding: 0 40rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.privacy-link {
|
.privacy-link {
|
||||||
color: #2f80ed;
|
color: #2f80ed;
|
||||||
}
|
}
|
||||||
|
|
||||||
.privacy-button-flex {
|
.privacy-button-flex {
|
||||||
display: flex;
|
display: flex;
|
||||||
padding: 20rpx 40rpx;
|
padding: 20rpx 40rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.privacy-button-btn {
|
.privacy-button-btn {
|
||||||
color: #FFF;
|
color: #FFF;
|
||||||
font-size: 30rpx;
|
font-size: 30rpx;
|
||||||
font-weight: 500;
|
// #ifdef QUICKAPP-WEBVIEW || H5 || WEB
|
||||||
line-height: 100rpx;
|
font-size: 28rpx;
|
||||||
text-align: center;
|
// #endif
|
||||||
height: 100rpx;
|
font-weight: 500;
|
||||||
border-radius: 20rpx;
|
line-height: 100rpx;
|
||||||
border: none;
|
text-align: center;
|
||||||
background: #07c160;
|
height: 100rpx;
|
||||||
flex: 1;
|
border-radius: 20rpx;
|
||||||
margin-right: 30rpx;
|
border: none;
|
||||||
justify-content: center;
|
background: #07c160;
|
||||||
}
|
flex: 1;
|
||||||
|
margin-right: 30rpx;
|
||||||
|
justify-content: center;
|
||||||
|
}
|
||||||
|
|
||||||
.privacy-button-btn::after {
|
.privacy-button-btn::after {
|
||||||
border: none;
|
border: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.bg-disagree {
|
.bg-disagree {
|
||||||
color: #07c160;
|
color: #07c160;
|
||||||
background: #f2f2f2;
|
background: #f2f2f2;
|
||||||
}
|
}
|
||||||
|
|
||||||
.bg-agree {
|
.bg-agree {
|
||||||
margin-right: 0rpx;
|
margin-right: 0rpx;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
@@ -3,5 +3,5 @@ export const lang = {
|
|||||||
title: '商品分类',
|
title: '商品分类',
|
||||||
search:'商品搜索',
|
search:'商品搜索',
|
||||||
seeMore : '查看更多',
|
seeMore : '查看更多',
|
||||||
Make: "咨询"
|
Make: "询底价"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ export const lang = {
|
|||||||
status:'该商品已下架',
|
status:'该商品已下架',
|
||||||
sellout:'库存不足',
|
sellout:'库存不足',
|
||||||
max:'已达最大限购数量',
|
max:'已达最大限购数量',
|
||||||
makebtn:' ',
|
makebtn:'价格电议',
|
||||||
sales:'销量',
|
sales:'销量',
|
||||||
stock:'库存',
|
stock:'库存',
|
||||||
kefu:'客服',
|
kefu:'客服',
|
||||||
|
|||||||
@@ -6,6 +6,6 @@ export const lang = {
|
|||||||
Price:'价格',
|
Price:'价格',
|
||||||
Filter:'筛选',
|
Filter:'筛选',
|
||||||
Search:'请输入您要搜索的商品',
|
Search:'请输入您要搜索的商品',
|
||||||
Make:'查看详情',
|
Make:'立即询底价',
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -137,10 +137,8 @@
|
|||||||
</uni-popup>
|
</uni-popup>
|
||||||
</view>
|
</view>
|
||||||
<hover-nav :need="true"></hover-nav>
|
<hover-nav :need="true"></hover-nav>
|
||||||
<!-- #ifdef MP-WEIXIN -->
|
<!-- 隐私协议 -->
|
||||||
<!-- 小程序隐私协议 -->
|
|
||||||
<privacy-popup ref="privacyPopup"></privacy-popup>
|
<privacy-popup ref="privacyPopup"></privacy-popup>
|
||||||
<!-- #endif -->
|
|
||||||
<to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
|
<to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
|
||||||
<ns-login ref="login"></ns-login>
|
<ns-login ref="login"></ns-login>
|
||||||
</view>
|
</view>
|
||||||
|
|||||||
@@ -90,7 +90,10 @@
|
|||||||
<view class="goods-tag-list" v-if="goodsSkuDetail.label_name">
|
<view class="goods-tag-list" v-if="goodsSkuDetail.label_name">
|
||||||
<text class="tag-item">{{ goodsSkuDetail.label_name }}</text>
|
<text class="tag-item">{{ goodsSkuDetail.label_name }}</text>
|
||||||
</view>
|
</view>
|
||||||
|
<view class="logistics-wrap">
|
||||||
|
<text v-if="goodsSkuDetail.stock_show">{{$lang('stock')}}: {{ goodsSkuDetail.stock +goodsSkuDetail.unit}}</text>
|
||||||
|
<text v-if="goodsSkuDetail.sale_show">{{$lang('sales')}}: {{ goodsSkuDetail.sale_num+goodsSkuDetail.unit }}</text>
|
||||||
|
</view>
|
||||||
<!-- 会员卡 -->
|
<!-- 会员卡 -->
|
||||||
<!-- <view class="member-card-wrap" @click="$util.redirectTo('/pages_tool/member/card_buy')" v-if="membercard">
|
<!-- <view class="member-card-wrap" @click="$util.redirectTo('/pages_tool/member/card_buy')" v-if="membercard">
|
||||||
<text class="iconfont icon-huiyuan"></text>
|
<text class="iconfont icon-huiyuan"></text>
|
||||||
|
|||||||
@@ -319,9 +319,8 @@ export default {
|
|||||||
@import './public/css/list.scss';
|
@import './public/css/list.scss';
|
||||||
</style>
|
</style>
|
||||||
<style scoped>
|
<style scoped>
|
||||||
.uni-tag--primary.uni-tag--inverted {
|
>>>.uni-tag--primary.uni-tag--inverted {
|
||||||
background-color: #f5f5f5 !important;
|
background-color: #f5f5f5 !important;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
|
/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -23,9 +23,9 @@
|
|||||||
|
|
||||||
<view class="lineheight-clear">
|
<view class="lineheight-clear">
|
||||||
<view class="discount-price">
|
<view class="discount-price">
|
||||||
|
<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
|
||||||
|
<text class="price price-style large">{{ parseFloat(showPrice(item)).toFixed(2).split('.')[0] }}</text>
|
||||||
|
<text class="unit price-style small">.{{ parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="member-price-tag" v-if="item.member_price && item.member_price == showPrice(item)">
|
<view class="member-price-tag" v-if="item.member_price && item.member_price == showPrice(item)">
|
||||||
<image :src="$util.img('public/uniapp/index/VIP.png')" mode="widthFix"></image>
|
<image :src="$util.img('public/uniapp/index/VIP.png')" mode="widthFix"></image>
|
||||||
@@ -39,7 +39,7 @@
|
|||||||
<text class="unit">{{ $lang('common.currencySymbol') }}</text>
|
<text class="unit">{{ $lang('common.currencySymbol') }}</text>
|
||||||
<text>{{ showMarketPrice(item) }}</text>
|
<text>{{ showMarketPrice(item) }}</text>
|
||||||
</view>
|
</view>
|
||||||
|
<view class="sale font-size-activity-tag color-tip" v-if="item.sale_show">已售{{ item.sale_num }}{{ item.unit ? item.unit : '件' }}</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|||||||
@@ -96,6 +96,7 @@ export default {
|
|||||||
this.$store.commit('setMemberInfo', '');
|
this.$store.commit('setMemberInfo', '');
|
||||||
this.$store.dispatch('emptyCart');
|
this.$store.dispatch('emptyCart');
|
||||||
uni.removeStorageSync('authInfo');
|
uni.removeStorageSync('authInfo');
|
||||||
|
uni.removeStorageSync('privacyAgreed');
|
||||||
this.$util.redirectTo(this.$util.MEMBER_PAGE_URL);
|
this.$util.redirectTo(this.$util.MEMBER_PAGE_URL);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -118,7 +119,9 @@ export default {
|
|||||||
this.$store.commit('setMemberInfo', '');
|
this.$store.commit('setMemberInfo', '');
|
||||||
this.$store.dispatch('emptyCart');
|
this.$store.dispatch('emptyCart');
|
||||||
uni.removeStorageSync('authInfo');
|
uni.removeStorageSync('authInfo');
|
||||||
|
uni.removeStorageSync('privacyAgreed');
|
||||||
this.$util.redirectTo(this.$util.MEMBER_PAGE_URL);
|
this.$util.redirectTo(this.$util.MEMBER_PAGE_URL);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
this.$util.showToast({
|
this.$util.showToast({
|
||||||
title: rres.message
|
title: rres.message
|
||||||
|
|||||||
Reference in New Issue
Block a user