333
This commit is contained in:
zpc
parent
c4a90adc41
commit
05ccf0ffa9
|
|
@ -118,7 +118,7 @@ export default {
|
|||
if (item.ttype == 2) {
|
||||
/* 一番赏 */
|
||||
this.to({
|
||||
url: '/pages/main/detail',
|
||||
url: '/pages/main/xq',
|
||||
query: {
|
||||
goods_id: item.goods_id
|
||||
}
|
||||
|
|
@ -128,7 +128,7 @@ export default {
|
|||
/* 无限赏 */
|
||||
if (item.ttype == 3) {
|
||||
this.to({
|
||||
url: '/pages/main/detail_wuxian',
|
||||
url: '/pages/main/xq_wx',
|
||||
query: {
|
||||
goods_id: item.goods_id
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,10 +14,10 @@ const wx_version = "117";
|
|||
export const whiteList = [
|
||||
"pages/main/index", // 首页
|
||||
"pages/index/index",
|
||||
"pages/main/detail", // 详情页
|
||||
"pages/main/huanxiang", // 换箱页面
|
||||
"pages/main/xq", // 详情页
|
||||
"pages/main/hx", // 换箱页面
|
||||
"pages/shangcheng/index", // 商城首页
|
||||
"pages/main/detail_wuxian", // 无限详情页
|
||||
"pages/main/xq_wx", // 无限详情页
|
||||
"pages/kit/kit", // 盒柜页面
|
||||
"pages/infinite/index", // 福利首页
|
||||
"pages/users/index", // 用户中心
|
||||
|
|
@ -27,7 +27,7 @@ export const whiteList = [
|
|||
"pages/main/danye", // 单页
|
||||
"pages/guize/guize", // 规则页面
|
||||
"pages/main/dada_ranking", // 达达排行榜
|
||||
"pages/main/invite_ranking", // 邀请排行榜
|
||||
"pages/main/invite", // 邀请排行榜
|
||||
"pages/users/login", // 登录页面
|
||||
"pages/main/slots",
|
||||
"pages/other/web-pay-order", // 网页支付订单
|
||||
|
|
|
|||
|
|
@ -242,7 +242,7 @@ class RequestManager {
|
|||
title: '加载中...'
|
||||
})
|
||||
}
|
||||
|
||||
let startDate = Date.now();
|
||||
// 发起网络请求
|
||||
uni.request({
|
||||
url: requestUrl,
|
||||
|
|
@ -250,6 +250,8 @@ class RequestManager {
|
|||
header: header,
|
||||
data: data,
|
||||
success: res => {
|
||||
let endDate = Date.now();
|
||||
console.log(requestUrl, "请求时间", endDate - startDate);
|
||||
res = normalizeResponseKeys(res);
|
||||
console.log("res.data.status", res.data.status)
|
||||
var pages = getCurrentPages()
|
||||
|
|
|
|||
|
|
@ -22,14 +22,14 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/main/detail",
|
||||
"path": "pages/main/xq",
|
||||
"style": {
|
||||
"navigationStyle": "custom",
|
||||
"navigationBarTextStyle": "black"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/main/detail_wuxian",
|
||||
"path": "pages/main/xq_wx",
|
||||
"style": {
|
||||
"navigationStyle": "custom",
|
||||
"navigationBarBackgroundColor": "#222222",
|
||||
|
|
@ -37,7 +37,7 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/main/huanxiang",
|
||||
"path": "pages/main/hx",
|
||||
"style": {
|
||||
"navigationBarTitleText": "换箱",
|
||||
"navigationBarBackgroundColor": "#222222",
|
||||
|
|
@ -175,7 +175,7 @@
|
|||
},
|
||||
|
||||
{
|
||||
"path": "pages/main/invite_ranking",
|
||||
"path": "pages/main/invite",
|
||||
"style": {
|
||||
"navigationBarTitleText": "",
|
||||
"enablePullDownRefresh": false,
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ export default {
|
|||
icon: icon,
|
||||
login_icon: login_icon,
|
||||
tips: "正在加载中。。。",
|
||||
neverTrue: false,
|
||||
neverTrue: false
|
||||
}
|
||||
},
|
||||
onLoad() {
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ export default {
|
|||
methods: {
|
||||
items(item) {
|
||||
this.$common.to({
|
||||
url: '/pages/main/detail',
|
||||
url: '/pages/main/xq',
|
||||
query: {
|
||||
goods_id: item.id,
|
||||
type_text: '积分赏'
|
||||
|
|
|
|||
|
|
@ -371,14 +371,7 @@ export default {
|
|||
zhanshiMoney: 0,
|
||||
isAgree: false,
|
||||
is_exchange: '0',
|
||||
show_dadajuan: false,
|
||||
_unusedData: {
|
||||
tempValue: 123,
|
||||
dummyArray: [1, 2, 3],
|
||||
unusedObject: { key: 'value' }
|
||||
},
|
||||
_hiddenCounter: 0,
|
||||
_unusedFlag: false
|
||||
show_dadajuan: false
|
||||
}
|
||||
},
|
||||
onShow() {
|
||||
|
|
@ -772,10 +765,7 @@ export default {
|
|||
data.status = this.tabList[this.tabCur].status
|
||||
}
|
||||
try {
|
||||
// let l = { "goods_title": "一生爱干净的你Y", "goods_id": 1037, "orderlist": [{ "shang_title": "普通", "id": 49368, "goodslist_title": "哪吒贴纸", "goodslist_imgurl": "https://image.zfunbox.cn/topic/20250424/6294f30d70b3a90a744c0b8d11237501.png", "goodslist_money": 25, "goods_id": 1037, "shang_id": 38, "prize_code": "qMjx4Jnb10_1744275374", "prize_num": 2, "order_list_ids": [49368, 49370], "chooseNum": 0 }], "orderlist_total": 2, "orderlist_length": 1 };
|
||||
// this.listData.push(l);
|
||||
// this.mescroll.endByPage(1,1)
|
||||
// return;
|
||||
|
||||
this.req({
|
||||
url,
|
||||
data,
|
||||
|
|
@ -797,11 +787,6 @@ export default {
|
|||
if (res.data.show_dadajuan != null) {
|
||||
this.show_dadajuan = res.data.show_dadajuan
|
||||
}
|
||||
// console.log(res.data.data, res.data.data.length);
|
||||
|
||||
// this.listData.push(res.data.data[0]);
|
||||
// console.log(JSON.stringify(res.data.data[0]));
|
||||
|
||||
this.listData = this.listData.concat(res.data.data)
|
||||
console.log(this.GetOrderList);
|
||||
|
||||
|
|
@ -895,21 +880,8 @@ export default {
|
|||
return "#FFFFFF";
|
||||
break;
|
||||
}
|
||||
},
|
||||
_unusedMethod() {
|
||||
const temp = 1 + 2;
|
||||
console.log('这是一个未使用的方法');
|
||||
return temp;
|
||||
},
|
||||
_dummyCalculation() {
|
||||
const x = 10;
|
||||
const y = 20;
|
||||
return x * y;
|
||||
},
|
||||
_unusedHelper() {
|
||||
const arr = [1, 2, 3, 4, 5];
|
||||
return arr.map(item => item * 2);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
|
@ -1883,55 +1855,4 @@ export default {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
.unused-container {
|
||||
display: none;
|
||||
opacity: 0;
|
||||
transform: scale(0);
|
||||
}
|
||||
|
||||
.hidden-text {
|
||||
visibility: hidden;
|
||||
position: absolute;
|
||||
left: -9999px;
|
||||
}
|
||||
|
||||
@keyframes spin {
|
||||
from { transform: rotate(0deg); }
|
||||
to { transform: rotate(360deg); }
|
||||
}
|
||||
|
||||
@keyframes bounce {
|
||||
0%, 100% { transform: translateY(0); }
|
||||
50% { transform: translateY(-20px); }
|
||||
}
|
||||
|
||||
.spinning-box {
|
||||
width: 50px;
|
||||
height: 50px;
|
||||
background: #f00;
|
||||
animation: spin 2s linear infinite;
|
||||
}
|
||||
|
||||
.bouncing-ball {
|
||||
width: 30px;
|
||||
height: 30px;
|
||||
background: #0f0;
|
||||
animation: bounce 1s ease-in-out infinite;
|
||||
}
|
||||
|
||||
$unused-color: #ff0000;
|
||||
$dummy-spacing: 20px;
|
||||
$hidden-opacity: 0;
|
||||
|
||||
@mixin unused-mixin {
|
||||
padding: $dummy-spacing;
|
||||
background: $unused-color;
|
||||
opacity: $hidden-opacity;
|
||||
}
|
||||
|
||||
.unused-class {
|
||||
@include unused-mixin;
|
||||
display: none;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
<template>
|
||||
<page-container :title="title" :showBack="true">
|
||||
<rich-text :nodes="content"></rich-text>
|
||||
|
||||
</page-container>
|
||||
</template>
|
||||
|
||||
|
|
|
|||
|
|
@ -340,14 +340,14 @@
|
|||
},
|
||||
todetails(e) {
|
||||
// 无限赏
|
||||
let url = "/pages/main/detail";
|
||||
let url = "/pages/main/xq";
|
||||
let params = {
|
||||
goods_id: e.id,
|
||||
// type_text: e.type_text
|
||||
};
|
||||
|
||||
if (e.type == 2 || e.type == 8 || e.type == 16) {
|
||||
url = "/pages/main/detail_wuxian";
|
||||
url = "/pages/main/xq_wx";
|
||||
}
|
||||
|
||||
if (e.type == 9) {
|
||||
|
|
@ -372,7 +372,7 @@
|
|||
this.$customRouter.navigateTo("/pages/main/ranking");
|
||||
},
|
||||
toyaqingRanking() {
|
||||
this.$customRouter.navigateTo("/pages/main/invite_ranking");
|
||||
this.$customRouter.navigateTo("/pages/main/invite");
|
||||
},
|
||||
|
||||
jumapSlots() {
|
||||
|
|
|
|||
|
|
@ -249,7 +249,7 @@ export default {
|
|||
title: this.$config.getAppSetting("app_name") +
|
||||
`${this.pageData.goods.title}系列 第${this.pageData.goods.num}套`,
|
||||
imageUrl: this.pageData.goods.imgurl_detail,
|
||||
path: "/pages/main/detail" +
|
||||
path: "/pages/main/xq" +
|
||||
this.$common.qs({
|
||||
goods_id: this.pageData.goods.id,
|
||||
goods_num: this.pageData.goods.num,
|
||||
|
|
@ -572,7 +572,7 @@ export default {
|
|||
|
||||
changeBox() {
|
||||
this.$common.to({
|
||||
url: "/pages/main/huanxiang",
|
||||
url: "/pages/main/hx",
|
||||
query: {
|
||||
id: this.pageData.goods.id,
|
||||
type_text: this.optData.type_text,
|
||||
|
|
@ -314,7 +314,7 @@ export default {
|
|||
return {
|
||||
title: this.$config.getAppSetting("app_name") + `${this.pageData.goods.title}系列`,
|
||||
imageUrl: this.pageData.goods.imgurl_detail,
|
||||
path: '/pages/main/detail_wuxian' +
|
||||
path: '/pages/main/xq_wx' +
|
||||
this.$common.qs({
|
||||
goods_id: this.pageData.goods.id,
|
||||
goods_num: this.pageData.goods.num,
|
||||
|
|
@ -106,11 +106,11 @@ export default {
|
|||
* @param {Object} item 商品项
|
||||
*/
|
||||
toDetail(item) {
|
||||
let url = "/pages/main/detail";
|
||||
let url = "/pages/main/xq";
|
||||
|
||||
// 根据商品类型跳转到不同详情页
|
||||
if (item.type === 2 || item.type === 8) {
|
||||
url = "/pages/main/detail_wuxian";
|
||||
url = "/pages/main/xq_wx";
|
||||
} else if (item.type === 9) {
|
||||
url = "/package/index/lian-ji";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -219,7 +219,7 @@ export default {
|
|||
})
|
||||
},
|
||||
toorder(e) {
|
||||
this.$customRouter.navigateTo('/pages/main/detail', {
|
||||
this.$customRouter.navigateTo('/pages/main/xq', {
|
||||
goods_id: e,
|
||||
goods_num: 1
|
||||
})
|
||||
|
|
|
|||
|
|
@ -300,11 +300,11 @@ export default {
|
|||
},
|
||||
todetail(a) {
|
||||
if (a.type == 2) {
|
||||
this.$customRouter.navigateTo('/pages/main/detail_wuxian', {
|
||||
this.$customRouter.navigateTo('/pages/main/xq_wx', {
|
||||
goods_id: a.goods_id
|
||||
});
|
||||
} else {
|
||||
this.$customRouter.navigateTo('/pages/main/detail', {
|
||||
this.$customRouter.navigateTo('/pages/main/xq', {
|
||||
goods_id: a.goods_id,
|
||||
goods_num: a.num
|
||||
});
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user