Merge branch 'youda' of http://123.207.203.228:3000/shang/yfs into youda
This commit is contained in:
commit
5f3161e9d2
19
App.vue
19
App.vue
|
|
@ -224,17 +224,16 @@ button.hide {
|
||||||
}
|
}
|
||||||
|
|
||||||
@keyframes m-zoom {
|
@keyframes m-zoom {
|
||||||
0% {
|
0% {
|
||||||
transform: scale(1);
|
transform: scale(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
50% {
|
50% {
|
||||||
transform: scale(0.9);
|
transform: scale(0.9);
|
||||||
}
|
}
|
||||||
|
|
||||||
100% {
|
100% {
|
||||||
transform: scale(1);
|
transform: scale(1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|
|
||||||
|
|
@ -47,7 +47,7 @@ const defaultConfig = {
|
||||||
"exchange_times": "2",
|
"exchange_times": "2",
|
||||||
"balance_name": "钻石",
|
"balance_name": "钻石",
|
||||||
"balance_icon": "https://image.zfunbox.cn/app/icons/20250412/a482b527477e74f8a18ec02ebc7f0b4e.png",
|
"balance_icon": "https://image.zfunbox.cn/app/icons/20250412/a482b527477e74f8a18ec02ebc7f0b4e.png",
|
||||||
|
|
||||||
"currency1_name": "UU币",
|
"currency1_name": "UU币",
|
||||||
"currency1_icon": "https://image.zfunbox.cn/app/icons/20250412/3d1741965e9439372d1ce101bd110616.png",
|
"currency1_icon": "https://image.zfunbox.cn/app/icons/20250412/3d1741965e9439372d1ce101bd110616.png",
|
||||||
"currency2_name": "达达券",
|
"currency2_name": "达达券",
|
||||||
|
|
@ -67,6 +67,9 @@ const defaultConfig = {
|
||||||
|
|
||||||
// 配置类
|
// 配置类
|
||||||
class ConfigManager {
|
class ConfigManager {
|
||||||
|
static getShareImageUrl() {
|
||||||
|
return "https://image.zfunbox.cn/icon/fenxiang.jpg";//this.getAppSetting('share_image_url');
|
||||||
|
}
|
||||||
/**
|
/**
|
||||||
* 初始化并加载配置
|
* 初始化并加载配置
|
||||||
* 在应用启动时调用
|
* 在应用启动时调用
|
||||||
|
|
@ -179,7 +182,7 @@ class ConfigManager {
|
||||||
let goodType = this.get('good_type');
|
let goodType = this.get('good_type');
|
||||||
if (goodType != null) {
|
if (goodType != null) {
|
||||||
if (this.GetVersion()) {
|
if (this.GetVersion()) {
|
||||||
return goodType.filter(item => item.is_show === 1 && (item.value === 2||item.value === 0)).map(item => {
|
return goodType.filter(item => item.is_show === 1 && (item.value === 2 || item.value === 0)).map(item => {
|
||||||
return {
|
return {
|
||||||
id: item.value,
|
id: item.value,
|
||||||
title: item.name
|
title: item.name
|
||||||
|
|
|
||||||
|
|
@ -47,6 +47,14 @@ export default {
|
||||||
guize: ''
|
guize: ''
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
onShareAppMessage() {
|
||||||
|
let imageUrl = this.$config.getShareImageUrl();
|
||||||
|
return {
|
||||||
|
imageUrl: imageUrl,
|
||||||
|
title: "友达上线,来就送!",
|
||||||
|
path: '/pages/shouye/index?pid=' + uni.getStorageSync('userinfo').ID
|
||||||
|
}
|
||||||
|
},
|
||||||
methods: {
|
methods: {
|
||||||
items(item) {
|
items(item) {
|
||||||
this.$c.to({
|
this.$c.to({
|
||||||
|
|
|
||||||
|
|
@ -121,7 +121,14 @@ export default {
|
||||||
endedLoaded: false, // 已结束数据是否已加载
|
endedLoaded: false, // 已结束数据是否已加载
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
onShareAppMessage() {
|
||||||
|
let imageUrl = this.$config.getShareImageUrl();
|
||||||
|
return {
|
||||||
|
imageUrl: imageUrl,
|
||||||
|
title: "友达上线,来就送!",
|
||||||
|
path: '/pages/infinite/index'
|
||||||
|
}
|
||||||
|
},
|
||||||
async onLoad() {
|
async onLoad() {
|
||||||
this.loadOngoingData();
|
this.loadOngoingData();
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -169,7 +169,9 @@ export default {
|
||||||
PageContainer
|
PageContainer
|
||||||
},
|
},
|
||||||
onShareAppMessage() {
|
onShareAppMessage() {
|
||||||
|
let imageUrl = this.$config.getShareImageUrl();
|
||||||
return {
|
return {
|
||||||
|
imageUrl: imageUrl,
|
||||||
title: this.bonusData.title,
|
title: this.bonusData.title,
|
||||||
path: '/pages/infinite/bonus_house_details?goods_id=' + this.goods_id
|
path: '/pages/infinite/bonus_house_details?goods_id=' + this.goods_id
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -95,6 +95,14 @@ export default {
|
||||||
components: {
|
components: {
|
||||||
PageContainer
|
PageContainer
|
||||||
},
|
},
|
||||||
|
onShareAppMessage() {
|
||||||
|
let imageUrl = this.$config.getShareImageUrl();
|
||||||
|
return {
|
||||||
|
imageUrl: imageUrl,
|
||||||
|
title: "友达上线,来就送!",
|
||||||
|
path: '/pages/infinite/index'
|
||||||
|
}
|
||||||
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
tipVisible: false,
|
tipVisible: false,
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,14 @@ export default {
|
||||||
list: []
|
list: []
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
onShareAppMessage() {
|
||||||
|
let imageUrl = this.$config.getShareImageUrl();
|
||||||
|
return {
|
||||||
|
imageUrl: imageUrl,
|
||||||
|
title: "友达上线,来就送!",
|
||||||
|
path: '/pages/shouye/index?pid=' + uni.getStorageSync('userinfo').ID
|
||||||
|
}
|
||||||
|
},
|
||||||
methods: {
|
methods: {
|
||||||
// 获取福利屋菜单列表
|
// 获取福利屋菜单列表
|
||||||
getWelfareList() {
|
getWelfareList() {
|
||||||
|
|
|
||||||
|
|
@ -144,6 +144,14 @@ export default {
|
||||||
components: {
|
components: {
|
||||||
EmptyState: () => import('@/components/empty-state/empty-state.vue')
|
EmptyState: () => import('@/components/empty-state/empty-state.vue')
|
||||||
},
|
},
|
||||||
|
onShareAppMessage() {
|
||||||
|
let imageUrl = this.$config.getShareImageUrl();
|
||||||
|
return {
|
||||||
|
imageUrl: imageUrl,
|
||||||
|
title: "友达上线,来就送!",
|
||||||
|
path: '/pages/shouye/index?pid=' + uni.getStorageSync('userinfo').ID
|
||||||
|
}
|
||||||
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
statusBarHeight: 0,
|
statusBarHeight: 0,
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -245,10 +245,11 @@ export default {
|
||||||
},
|
},
|
||||||
|
|
||||||
onShareAppMessage() {
|
onShareAppMessage() {
|
||||||
let that = this;
|
let imageUrl = this.$config.getShareImageUrl();
|
||||||
return {
|
return {
|
||||||
|
imageUrl: imageUrl,
|
||||||
title: this.$config.getAppSetting("app_name") + ",正版潮玩手办一番赏",
|
title: this.$config.getAppSetting("app_name") + ",正版潮玩手办一番赏",
|
||||||
imageUrl: that.advert[0].imgurl,
|
|
||||||
path: "/pages/shouye/index?pid=" + uni.getStorageSync("userinfo").ID,
|
path: "/pages/shouye/index?pid=" + uni.getStorageSync("userinfo").ID,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
@ -371,7 +372,7 @@ export default {
|
||||||
keyword: that.keyword,
|
keyword: that.keyword,
|
||||||
},
|
},
|
||||||
success: function (res) {
|
success: function (res) {
|
||||||
|
|
||||||
let _data = res.data.data;
|
let _data = res.data.data;
|
||||||
let isWXPay = that.$config.GetVersion()
|
let isWXPay = that.$config.GetVersion()
|
||||||
if (isWXPay) {
|
if (isWXPay) {
|
||||||
|
|
|
||||||
2717
pages/user/index.vue
2717
pages/user/index.vue
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user