update
This commit is contained in:
ylj20011123
parent
e4af4ece81
commit
09c5731597
34
App.vue
34
App.vue
@ -64,21 +64,37 @@ export default {
|
||||
setVisitChannels: "setVisitChannels",
|
||||
}),
|
||||
handleGetUserInfo() {
|
||||
// wx.request({
|
||||
// // url: "https://qifu-api.baidubce.com/ip/local/geo/v1/district",
|
||||
// url: "https://www.ipify.org?format=json",
|
||||
// success(response) {
|
||||
// const data = response.data;
|
||||
|
||||
// 这里修改了方法 这个接口 可以直接拿到ip地址 和 ip地址信息的
|
||||
wx.request({
|
||||
url: "https://qifu-api.baidubce.com/ip/local/geo/v1/district",
|
||||
// url: "https://java.es.eshangtech.com:443/location/ip",
|
||||
url: "http://111.229.213.193:18071/location/ip",
|
||||
// data: { ip: data.ip },
|
||||
success(response) {
|
||||
const data = response.data;
|
||||
let ipDetail = response.data
|
||||
|
||||
// 处理数据
|
||||
let obj = {
|
||||
...data.data,
|
||||
ip: data.ip,
|
||||
// ...data.data,
|
||||
ip: ipDetail.ip,
|
||||
prov: ipDetail.content ? ipDetail.content.address_detail.province : "",
|
||||
city: ipDetail.content ? ipDetail.content.address_detail.city : "",
|
||||
district: ipDetail.content ? ipDetail.content.address_detail.district : "",
|
||||
};
|
||||
uni.setStorageSync("userInfo", obj);
|
||||
},
|
||||
fail(error) {
|
||||
// 处理错误
|
||||
},
|
||||
});
|
||||
}
|
||||
})
|
||||
|
||||
// },
|
||||
// fail(error) {
|
||||
// // 处理错误
|
||||
// },
|
||||
// });
|
||||
},
|
||||
login() {
|
||||
let _this = this;
|
||||
|
||||
@ -68,9 +68,11 @@ export default {
|
||||
PageIndex: 1,
|
||||
PageSize: 999999,
|
||||
appId: "wxee018fb96955552a",
|
||||
// type: 'encryption'
|
||||
};
|
||||
const newData = await this.$api.$post(
|
||||
"/EShangApiMain/Notice/GetNOTICEINFOList",
|
||||
// "/MemberApi/WisdomServerpart/GetNOTICEINFOList",
|
||||
newReq
|
||||
);
|
||||
let uselist = newData.Result_Data.List;
|
||||
@ -105,7 +107,7 @@ export default {
|
||||
|
||||
.contentItem {
|
||||
width: 100%;
|
||||
box-sizing: border-box;
|
||||
box-sizing: border-box;
|
||||
padding: 32rpx;
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
@ -117,7 +119,7 @@ export default {
|
||||
.left {
|
||||
width: calc(100% - 240rpx);
|
||||
margin-right: 20rpx;
|
||||
|
||||
|
||||
.title {
|
||||
font-size: 28rpx;
|
||||
font-weight: 600;
|
||||
|
||||
@ -367,7 +367,8 @@ export default {
|
||||
title: '加载中...',
|
||||
mask: true
|
||||
});
|
||||
const data = await this.$api.$posMemberPost("/MemberMessage/SynchroRTNOTICEINFO", req)
|
||||
// const data = await this.$api.$posMemberPost("/MemberMessage/SynchroRTNOTICEINFO", req)
|
||||
const data = await this.$api.$posMemberPost("/WisdomServerpart/SynchroRTNOTICEINFO", req)
|
||||
uni.hideLoading();
|
||||
|
||||
console.log('datadasdasdasda', data);
|
||||
|
||||
@ -748,7 +748,6 @@ export default {
|
||||
// 并行加载所有数据
|
||||
const loadPromises = [
|
||||
this.handleGetHighwayHeadlines(), // 高速头条播报
|
||||
|
||||
];
|
||||
|
||||
this.handleGetSpecialOffers() // 促销单品
|
||||
@ -982,52 +981,6 @@ export default {
|
||||
},
|
||||
// 拿到广告数据
|
||||
async handleGetAdvertisementData() {
|
||||
|
||||
let minReq = {
|
||||
ADDTIME: "2025-01-03T10:51:04",
|
||||
APPGUID: "2693711a-72eb-48dc-b3dc-5122424e8fd4",
|
||||
APPNAME: "",
|
||||
INTERFACE_ADDRESS: "",
|
||||
OPERATE_DATE: "2025-01-07T09:44:04",
|
||||
OWNERUNIT_ID: 911,
|
||||
OWNERUNIT_NAME: "云南交投集团经营开发有限公司彩云驿商业管理分公司",
|
||||
PROVINCE_CODE: null,
|
||||
STAFF_ID: 1,
|
||||
STAFF_NAME: "系统开发者",
|
||||
WECHATAPPSIGN_CODE: "",
|
||||
WECHATAPPSIGN_DESC: "",
|
||||
WECHATAPPSIGN_ID: 38,
|
||||
WECHATAPPSIGN_NAME: "彩云驿商城",
|
||||
WECHATAPP_APPID: "wxee018fb96955552a",
|
||||
WECHATAPP_APPSECRET: "4d7f57d88b38b593781b4b0fd9e1a323",
|
||||
WECHATPUBLICSIGN_ID: 3,
|
||||
}
|
||||
|
||||
|
||||
|
||||
// let req = {
|
||||
// WECHATAPPSIGN_ID: minReq.WECHATAPPSIGN_ID,
|
||||
// WECHATAPP_APPID: minReq.WECHATAPP_APPID,
|
||||
// USERDEFINEDTYPE_NAME: "小程序海报",
|
||||
// PRESALE_STARTTIME: "2025-06-26 00:00:00",
|
||||
// PRESALE_ENDTIME: "2025-07-02 23:59:59",
|
||||
// GOODSTYPE: "7000",
|
||||
// USERDEFINEDTYPE_STATE: 1,
|
||||
// USERDEFINEDTYPE_ICO: "https://eshangtech.com/minTestImg/banner_0626_0702.png",
|
||||
// OWNERUNIT_ID: 911,
|
||||
// PROVINCE_CODE: "530000",
|
||||
// STAFF_ID: 2785,
|
||||
|
||||
// type: 'encryption'
|
||||
// }
|
||||
// const data = await this.$api.$zzyLocalPost(
|
||||
// "/MallBasic/SynchroUSERDEFINEDTYPE",
|
||||
// req
|
||||
// );
|
||||
|
||||
// console.log('datadatadatadatadatadatadatadatadata', data);
|
||||
|
||||
|
||||
let req = {
|
||||
SearchParameter: {
|
||||
OWNERUNIT_ID: 911,
|
||||
@ -1955,81 +1908,6 @@ export default {
|
||||
},
|
||||
// 高速头条播报
|
||||
async handleGetHighwayHeadlines() {
|
||||
// let start = `${this.$moment
|
||||
// .now()
|
||||
// .set("month", -1)
|
||||
// .format("YYYY-MM-DD")} 00:00:00`;
|
||||
// let end = `${this.$moment.now().format("YYYY-MM-DD")} 23:59:59`;
|
||||
// let params = {
|
||||
// startQueryTime: start, // 开始时间
|
||||
// endQueryTime: end, // 结束时间
|
||||
// };
|
||||
// let time = Math.ceil(new Date().getTime() / 1000);
|
||||
|
||||
// let req = {
|
||||
// app_id: "530000301",
|
||||
// biz_content: JSON.stringify(params),
|
||||
// charset: "UTF-8",
|
||||
// pid: "530000301",
|
||||
// service: "trawe.eats.etc",
|
||||
// utc_timestamp: time,
|
||||
// version: "1.0",
|
||||
// sign_type: "RSA2",
|
||||
// };
|
||||
// let signText = `app_id=${req.app_id}&biz_content=${req.biz_content}&charset=UTF-8&pid=${req.app_id}&service=trawe.eats.etc&utc_timestamp=${req.utc_timestamp}&version=1.0`;
|
||||
|
||||
// // 签名
|
||||
// const sign = await new Promise((resolve, reject) => {
|
||||
// uni.request({
|
||||
// url: "https://admin.es.eshangtech.com/prod-api/RSA/sign",
|
||||
// method: "POST",
|
||||
// data: {
|
||||
// originalText: signText,
|
||||
// privateKey:
|
||||
// "MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCtIkIJLbZYI9NvTRkRbqtjJ73gkAUJZBJw88Z+O8prX2HXMTIedmZZxTwbfM5kGpl9VmS0CY8QL0DnDsgHO8QnSDpN1jiqTD9lk1evycuF7ujmlOk/cJ5x2cLPn9rPIrQn1lxp9mBiO1m9vsrNOze/kx7wRyif/+hvn5Q9KtNEMy0K8oOE5vktnjkk1AhhXrTii9eIjOrO3pRgh9cFA9kqQpvD14CImD7tdCgyntKcYAB7rlin6a2N0yH9JJINjOyOiyHufP8sR7pb9VYXVYXukOCItdC9QQluQhSdyC/3BfZD5zV1A+X7pUle7dDLGG6aSZyCibg16siFIEX94KYfAgMBAAECggEAcP5uwrbGzvdywq06sxnbWTdSwQC9iMd7EaTH4xL6pOD3Zg6Be0givGvxMq9dtA94JUkBKE8kw5dTcHlBKxdiiZCmHK63BM4GgjCLhfrZjWvDLNn68KB7iCpq7j6R+6XWljlczvsxJGs/woqGqTMAy1MlWgPXC7Vk6ZTolpMglt0IJOzPtgJ66qU2CtNRjowkXSCHDO2RCjkmYcjU6W+eCvi9cXIXhLv5yra1PE0KOxn3NiEFwgGUXpu8LKqxuUfGLuHljoLxWV8EEfwZaWB6Wy1DHMMgxhKrO3xEmdMEqtvJmF98LRSYiJerkExY8Gdx8bkLPjlCLYKW4JVuPmyYgQKBgQD8l0lLtB94MQMib0t8RzqlbKcczTAkicjSms3/P4kwh50GC8OqwjJB75n4yQyDPgsjms/SnRMq1zjgm+MHSC4snpLCcvKFYLnvrslWGu/2lyUTwEwdUdQe1ILG4Y9NXKWg4zXpKfJ2Rz/cqw6bHGYhQWZ62AXQgiz+W7cIPrsHsQKBgQCveHGHF0WqtYAmrW7nf04PKmcJ5U2briYCWOtWJE5Mo5BYxsGLX6vI53DMNQ42hFk0ye61VNfcazAoGI3mM4+j6R9k3ek8EtkBYBro5eeoBtB7TMTJagQqzBLz316mJBsFmw3TiC9BzYhs3tKJnVxpfqXoqsyu2ZA6VG5Y/gXOzwKBgCbejPvmUvVm7WmOINqWB3NPXgPzm1X0EgA+rDZ8K3tZUxOMGeccDSnSWipLne5QTNyExThOzZVJG0qNEombVOeu2zyq/aECunoktnzWllim96CrdcsJPZAk+Z7rNOcdu6sfa7teph4HZs9pT00VOK4jZ0a+GV71uUDHEkplhNhxAoGAMDOi5BxFe/595KIR7C/xboMUaQh/iDuPn2dzxmcUx0LLPUfkFPhEBV1mhAIzFFDI/JJYK6HR5m/fe7Q7DritRbaddCTtlB4NVK5k1gOJ3oN4s9ZD3Jxt5p/GuQ1sP7F9Zs3QP4KSkL34MwgGx9zdbPFofACnV4TWdN+KrJGjYMsCgYAE0CMM7rYHGY3Vt3/WZZJ+DPlKE6Q+uvFDomtsB1IavCeEJyjBP9+GhBHat86aA3mCFjf4emj1or7OEgPc0gCMtKBG6m10CrzLjzdWnOTveqWVUW/FS2gf17cIO5/FK/4KmAjH/QN24KXm395Qu8C0UFfgA66yysakJFkvXVBiPg==",
|
||||
// },
|
||||
// header: {
|
||||
// "content-type": "application/json",
|
||||
// },
|
||||
// success(res) {
|
||||
// resolve(res.data.data);
|
||||
// },
|
||||
// });
|
||||
// });
|
||||
|
||||
// req.sign = sign;
|
||||
|
||||
// 推文数据
|
||||
// const tweetsData = await new Promise((resolve, reject) => {
|
||||
// uni.request({
|
||||
// url: `https://sxgzh.etclife.cn/etc/api/v1/gzh/point/tweets`,
|
||||
// method: "POST",
|
||||
// data: req,
|
||||
// header: {
|
||||
// "content-type": "application/x-www-form-urlencoded",
|
||||
// },
|
||||
// success(res) {
|
||||
// if (res.data.response.data) {
|
||||
// resolve(res.data.response.data.data.tweets);
|
||||
// } else {
|
||||
// resolve([])
|
||||
// }
|
||||
// // let data = res.data.CollectionObject;
|
||||
// // if (data && data.length > 0) {
|
||||
// // resolve(data);
|
||||
// // } else {
|
||||
// // resolve([]);
|
||||
// // }
|
||||
// },
|
||||
// });
|
||||
// });
|
||||
|
||||
// if (tweetsData && tweetsData.length > 0) {
|
||||
// this.roadStatusList = tweetsData;
|
||||
// } else {
|
||||
// this.roadStatusList = [];
|
||||
// }
|
||||
|
||||
let newReq = {
|
||||
SearchParameter: {
|
||||
// NOTICEINFO_TYPES: 1010,
|
||||
@ -2046,17 +1924,7 @@ export default {
|
||||
);
|
||||
let list = newData.Result_Data.List;
|
||||
|
||||
// if (list && list.length > 0) {
|
||||
// } else {
|
||||
// this.roadStatusList = [];
|
||||
// }
|
||||
// this.roadStatusList = list.concat(tweetsData);
|
||||
this.roadStatusList = list
|
||||
|
||||
|
||||
// this.roadStatusList.unshift({
|
||||
// NOTICEINFO_TITLE: "最新放假通知：调休2天，免费8天！",
|
||||
// });
|
||||
},
|
||||
// 跳转高速头条
|
||||
handleGoHighWay() {
|
||||
|
||||
@ -70,6 +70,7 @@ export default {
|
||||
// saleBillId: '',
|
||||
imageArr: [],
|
||||
},
|
||||
orderStatus: 0,
|
||||
noPost: true,
|
||||
storeMsg: {},
|
||||
imgsList: [],
|
||||
@ -93,6 +94,16 @@ export default {
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
// 把订单同步到 4000 已评价的状态
|
||||
async updateOrderStatus() {
|
||||
const req = {
|
||||
action_type: "UpdateOrderState",
|
||||
action_data: this.proMsg.SALEBILL_ID,
|
||||
saleBillChildId: this.proMsg.SALEBILL_CHILD_ID || "",
|
||||
SALEBILL_STATE: this.orderStatus === 4000 || this.orderStatus === 5000 ? 5000 : 4000,
|
||||
}
|
||||
await this.$api.getCoop(req)
|
||||
},
|
||||
isAnonymous(event, item) {
|
||||
console.log('eventevent', event);
|
||||
|
||||
@ -246,13 +257,17 @@ export default {
|
||||
uni.showToast({
|
||||
title: "评价成功！",
|
||||
});
|
||||
|
||||
if (_this.proMsg.SALEBILL_ID) {
|
||||
_this.updateOrderStatus()
|
||||
}
|
||||
setTimeout(() => {
|
||||
let i = 2;
|
||||
if (_this.saveMsg.merchantsId) {
|
||||
i = 1;
|
||||
}
|
||||
// let i = 2;
|
||||
// if (_this.saveMsg.merchantsId) {
|
||||
// i = 1;
|
||||
// }
|
||||
uni.navigateBack({
|
||||
delta: i,
|
||||
delta: 1,
|
||||
});
|
||||
}, 1000);
|
||||
} else {
|
||||
@ -328,6 +343,9 @@ export default {
|
||||
this.saveMsg.salebillId = option.orderInternal;
|
||||
this.saveMsg.action_type = "addMallComment";
|
||||
}
|
||||
if (option.orderStatus) {
|
||||
this.orderStatus = Number(option.orderStatus)
|
||||
}
|
||||
this.$utils.addUserBehaviorNew();
|
||||
},
|
||||
};
|
||||
|
||||
@ -20,9 +20,10 @@
|
||||
</view>
|
||||
<view scroll-x class="smallTypeBox">
|
||||
<view :class="currentTab === item.value ? 'smallTabItem selectSmallTabItem' : 'smallTabItem'"
|
||||
v-for="(item, index) in tabList" :key="index" @click="handleTab(item.value)"
|
||||
:style="{ background: item.value === 7 && selectBigTab === 3 ? 'transparent' : '' }">
|
||||
<template v-if="item.value === 7 && selectBigTab === 3 ? false : true">
|
||||
v-for="(item, index) in tabList" :key="index" @click="handleTab(item.value)">
|
||||
<!-- :style="{ background: item.value === 7 && selectBigTab === 3 ? 'transparent' : '' }" -->
|
||||
<template>
|
||||
<!-- v-if="item.value === 7 && selectBigTab === 3 ? false : true" -->
|
||||
{{ item.label }}
|
||||
<image v-if="currentTab === item.value" class="closeIcon"
|
||||
src="https://eshangtech.com/caiyunyiImg/closeIcon.png" />
|
||||
@ -62,8 +63,9 @@
|
||||
<view class="orderItemCenterRightRight">
|
||||
<view class="unitPrice">¥{{ subItem.AVERAGE_PRICE || '-' }}</view>
|
||||
<view class="orderItemQuantity">x{{ subItem.ORDER_COUNT || '-' }}</view>
|
||||
<view class="shopEvaluate" @click.stop="handleToEvaluate(item, subItem)">评价</view>
|
||||
<!-- v-if="item.SALEBILL_STATE > 3000 && item.SALEBILL_STATE <= 5000" -->
|
||||
<view class="shopEvaluate" v-if="item.SALEBILL_STATE >= 3000 && item.SALEBILL_STATE <= 5000"
|
||||
@click.stop="handleToEvaluate(item, subItem)">评价</view>
|
||||
<!-- -->
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -232,7 +234,7 @@ export default {
|
||||
console.log("this.currentTab", this.currentTab);
|
||||
let type =
|
||||
this.currentTab === 1
|
||||
? "1005,1010,2010,3000,8000,8010,8020,8900,8999,9000,9999"
|
||||
? "1005,1010,2010,3000,4000,5000,8000,8010,8020,8900,8999,9000,9999"
|
||||
: this.currentTab === 2
|
||||
? "1005"
|
||||
: this.currentTab === 3
|
||||
@ -240,7 +242,7 @@ export default {
|
||||
: this.currentTab === 4
|
||||
? "2010"
|
||||
: this.currentTab === 5
|
||||
? "3000"
|
||||
? "3000,4000,5000"
|
||||
: this.currentTab === 7
|
||||
? "8000,8010,8020,8900"
|
||||
: "";
|
||||
@ -259,7 +261,7 @@ export default {
|
||||
} else {
|
||||
let type =
|
||||
this.currentTab === 1
|
||||
? "1005,1010,2010,3000,8000,8010,8020,8900,8999,9000,9999"
|
||||
? "1005,1010,2010,3000,4000,5000,8000,8010,8020,8900,8999,9000,9999"
|
||||
: this.currentTab === 2
|
||||
? "1005"
|
||||
: this.currentTab === 3
|
||||
@ -267,7 +269,7 @@ export default {
|
||||
: this.currentTab === 4
|
||||
? "2010"
|
||||
: this.currentTab === 5
|
||||
? "3000"
|
||||
? "3000,4000,5000"
|
||||
: this.currentTab === 7
|
||||
? "8000,8010,8020,8900"
|
||||
: "";
|
||||
@ -328,7 +330,9 @@ export default {
|
||||
"&orderInternal=" +
|
||||
obj.SALEBILL_ID +
|
||||
"&proid=" +
|
||||
shopObj.COMMODITY_ID,
|
||||
shopObj.COMMODITY_ID +
|
||||
"&orderStatus=" +
|
||||
obj.SALEBILL_STATE
|
||||
// +
|
||||
// "type=" +
|
||||
// "DeliverId"
|
||||
@ -453,7 +457,7 @@ export default {
|
||||
})
|
||||
let type =
|
||||
this.currentTab === 1
|
||||
? "1005,1010,2010,3000,8000,8010,8020,8900,8999,9000,9999"
|
||||
? "1005,1010,2010,3000,4000,5000,8000,8010,8020,8900,8999,9000,9999"
|
||||
: this.currentTab === 2
|
||||
? "1005"
|
||||
: this.currentTab === 3
|
||||
@ -461,7 +465,7 @@ export default {
|
||||
: this.currentTab === 4
|
||||
? "2010"
|
||||
: this.currentTab === 5
|
||||
? "3000"
|
||||
? "3000,4000,5000"
|
||||
: this.currentTab === 7
|
||||
? "8000,8010,8020,8900"
|
||||
: "";
|
||||
|
||||
@ -9,21 +9,25 @@
|
||||
? "待收货"
|
||||
: orderInfo.SALEBILL_STATE === 3000
|
||||
? "已收货"
|
||||
: orderInfo.SALEBILL_STATE === 8000
|
||||
? "退款申请中"
|
||||
: orderInfo.SALEBILL_STATE === 8010
|
||||
? "商品退货中"
|
||||
: orderInfo.SALEBILL_STATE === 8020
|
||||
? "退款处理中"
|
||||
: orderInfo.SALEBILL_STATE === 8900
|
||||
? "订单已退款"
|
||||
: orderInfo.SALEBILL_STATE === 8999
|
||||
? "退款已关闭"
|
||||
: orderInfo.SALEBILL_STATE === 9000
|
||||
? "订单已关闭"
|
||||
: orderInfo.SALEBILL_STATE === 9999
|
||||
? "订单已撤销"
|
||||
: ""
|
||||
: orderInfo.SALEBILL_STATE === 4000
|
||||
? "已评价"
|
||||
: orderInfo.SALEBILL_STATE === 5000
|
||||
? "已追评"
|
||||
: orderInfo.SALEBILL_STATE === 8000
|
||||
? "退款申请中"
|
||||
: orderInfo.SALEBILL_STATE === 8010
|
||||
? "商品退货中"
|
||||
: orderInfo.SALEBILL_STATE === 8020
|
||||
? "退款处理中"
|
||||
: orderInfo.SALEBILL_STATE === 8900
|
||||
? "订单已退款"
|
||||
: orderInfo.SALEBILL_STATE === 8999
|
||||
? "退款已关闭"
|
||||
: orderInfo.SALEBILL_STATE === 9000
|
||||
? "订单已关闭"
|
||||
: orderInfo.SALEBILL_STATE === 9999
|
||||
? "订单已撤销"
|
||||
: ""
|
||||
}}
|
||||
</div>
|
||||
<div class="status-btn-box">
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
<text class="currentService">{{ detailInfo.SERVERPART_NAME }}</text>
|
||||
<image class="rightArrow" src="/static/images/home/rightArrow.svg" />
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="content" :style="{ paddingTop: menu.bottom + 14 + 'px' }">
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
33
unpackage/dist/dev/mp-weixin/common/main.js
vendored
33
unpackage/dist/dev/mp-weixin/common/main.js
vendored
@ -178,20 +178,37 @@ var _default = {
|
||||
setVisitChannels: "setVisitChannels"
|
||||
})), {}, {
|
||||
handleGetUserInfo: function handleGetUserInfo() {
|
||||
// wx.request({
|
||||
// // url: "https://qifu-api.baidubce.com/ip/local/geo/v1/district",
|
||||
// url: "https://www.ipify.org?format=json",
|
||||
// success(response) {
|
||||
// const data = response.data;
|
||||
|
||||
// 这里修改了方法 这个接口 可以直接拿到ip地址 和 ip地址信息的
|
||||
wx.request({
|
||||
url: "https://qifu-api.baidubce.com/ip/local/geo/v1/district",
|
||||
// url: "https://java.es.eshangtech.com:443/location/ip",
|
||||
url: "http://111.229.213.193:18071/location/ip",
|
||||
// data: { ip: data.ip },
|
||||
success: function success(response) {
|
||||
var data = response.data;
|
||||
var ipDetail = response.data;
|
||||
|
||||
// 处理数据
|
||||
var obj = _objectSpread(_objectSpread({}, data.data), {}, {
|
||||
ip: data.ip
|
||||
});
|
||||
var obj = {
|
||||
// ...data.data,
|
||||
ip: ipDetail.ip,
|
||||
prov: ipDetail.content ? ipDetail.content.address_detail.province : "",
|
||||
city: ipDetail.content ? ipDetail.content.address_detail.city : "",
|
||||
district: ipDetail.content ? ipDetail.content.address_detail.district : ""
|
||||
};
|
||||
uni.setStorageSync("userInfo", obj);
|
||||
},
|
||||
fail: function fail(error) {
|
||||
// 处理错误
|
||||
}
|
||||
});
|
||||
|
||||
// },
|
||||
// fail(error) {
|
||||
// // 处理错误
|
||||
// },
|
||||
// });
|
||||
},
|
||||
login: function login() {
|
||||
var _this = this;
|
||||
|
||||
@ -13535,7 +13535,7 @@ function addUserBehaviorNew(obj) {
|
||||
visitChannels: obj.visitChannels || '',
|
||||
behaviorRecordDesc: obj.behaviorRecordDesc || (app.globalData.recommendId && app.globalData.recommendCode ? "recommendId=".concat(app.globalData.recommendId, "&recommendCode=").concat(app.globalData.recommendCode) : ''),
|
||||
LoginIP: (userInfo === null || userInfo === void 0 ? void 0 : userInfo.ip) || '',
|
||||
LoginPlace: ((userInfo === null || userInfo === void 0 ? void 0 : userInfo.prov) || '') + (userInfo !== null && userInfo !== void 0 && userInfo.prov && userInfo !== null && userInfo !== void 0 && userInfo.city ? '-' : '') + ((userInfo === null || userInfo === void 0 ? void 0 : userInfo.city) || ''),
|
||||
LoginPlace: "".concat(userInfo.prov ? userInfo.prov : '').concat(userInfo.prov && userInfo.city ? '-' : '').concat(userInfo.city ? userInfo.city : '').concat(userInfo.prov && userInfo.city && userInfo.district ? '-' : '').concat(userInfo.district ? userInfo.district : ''),
|
||||
OperatingSystem: '彩云驿出行'
|
||||
};
|
||||
_api.default.$get('/CommercialApi/UserBehavior/AddUserBehavior', req).then(function () {});
|
||||
|
||||
160
unpackage/dist/dev/mp-weixin/pages/index/index.js
vendored
160
unpackage/dist/dev/mp-weixin/pages/index/index.js
vendored
@ -836,48 +836,11 @@ var _default = {
|
||||
handleGetAdvertisementData: function handleGetAdvertisementData() {
|
||||
var _this8 = this;
|
||||
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
|
||||
var minReq, req, data1, req2, data2, res1, res2, firstObj1, i, item, firstObj2, _i, _item;
|
||||
var req, data1, req2, data2, res1, res2, firstObj1, i, item, firstObj2, _i, _item;
|
||||
return _regenerator.default.wrap(function _callee4$(_context4) {
|
||||
while (1) {
|
||||
switch (_context4.prev = _context4.next) {
|
||||
case 0:
|
||||
minReq = {
|
||||
ADDTIME: "2025-01-03T10:51:04",
|
||||
APPGUID: "2693711a-72eb-48dc-b3dc-5122424e8fd4",
|
||||
APPNAME: "",
|
||||
INTERFACE_ADDRESS: "",
|
||||
OPERATE_DATE: "2025-01-07T09:44:04",
|
||||
OWNERUNIT_ID: 911,
|
||||
OWNERUNIT_NAME: "云南交投集团经营开发有限公司彩云驿商业管理分公司",
|
||||
PROVINCE_CODE: null,
|
||||
STAFF_ID: 1,
|
||||
STAFF_NAME: "系统开发者",
|
||||
WECHATAPPSIGN_CODE: "",
|
||||
WECHATAPPSIGN_DESC: "",
|
||||
WECHATAPPSIGN_ID: 38,
|
||||
WECHATAPPSIGN_NAME: "彩云驿商城",
|
||||
WECHATAPP_APPID: "wxee018fb96955552a",
|
||||
WECHATAPP_APPSECRET: "4d7f57d88b38b593781b4b0fd9e1a323",
|
||||
WECHATPUBLICSIGN_ID: 3
|
||||
}; // let req = {
|
||||
// WECHATAPPSIGN_ID: minReq.WECHATAPPSIGN_ID,
|
||||
// WECHATAPP_APPID: minReq.WECHATAPP_APPID,
|
||||
// USERDEFINEDTYPE_NAME: "小程序海报",
|
||||
// PRESALE_STARTTIME: "2025-06-26 00:00:00",
|
||||
// PRESALE_ENDTIME: "2025-07-02 23:59:59",
|
||||
// GOODSTYPE: "7000",
|
||||
// USERDEFINEDTYPE_STATE: 1,
|
||||
// USERDEFINEDTYPE_ICO: "https://eshangtech.com/minTestImg/banner_0626_0702.png",
|
||||
// OWNERUNIT_ID: 911,
|
||||
// PROVINCE_CODE: "530000",
|
||||
// STAFF_ID: 2785,
|
||||
// type: 'encryption'
|
||||
// }
|
||||
// const data = await this.$api.$zzyLocalPost(
|
||||
// "/MallBasic/SynchroUSERDEFINEDTYPE",
|
||||
// req
|
||||
// );
|
||||
// console.log('datadatadatadatadatadatadatadatadata', data);
|
||||
req = {
|
||||
SearchParameter: {
|
||||
OWNERUNIT_ID: 911,
|
||||
@ -887,9 +850,9 @@ var _default = {
|
||||
SortStr: "OPERATE_DATE desc",
|
||||
type: 'encryption'
|
||||
};
|
||||
_context4.next = 4;
|
||||
_context4.next = 3;
|
||||
return _this8.$api.$zzyLocalPost("/MallBasic/GetUSERDEFINEDTYPEList", req);
|
||||
case 4:
|
||||
case 3:
|
||||
data1 = _context4.sent;
|
||||
req2 = {
|
||||
SearchParameter: {
|
||||
@ -900,9 +863,9 @@ var _default = {
|
||||
SortStr: "OPERATE_DATE desc",
|
||||
type: 'encryption'
|
||||
};
|
||||
_context4.next = 8;
|
||||
_context4.next = 7;
|
||||
return _this8.$api.$zzyLocalPost("/MallBasic/GetUSERDEFINEDTYPEList", req2);
|
||||
case 8:
|
||||
case 7:
|
||||
data2 = _context4.sent;
|
||||
console.log('datadatadatadatadatadatadatadatadata', data1);
|
||||
console.log('datadatadatadatadatadatadatadatadata', data2);
|
||||
@ -910,50 +873,50 @@ var _default = {
|
||||
res2 = data2.Result_Data.List; // 修改一下 使用的是 当前时间在的范围内的第一个
|
||||
firstObj1 = {};
|
||||
if (!(res1 && res1.length > 0)) {
|
||||
_context4.next = 24;
|
||||
_context4.next = 23;
|
||||
break;
|
||||
}
|
||||
i = 0;
|
||||
case 16:
|
||||
case 15:
|
||||
if (!(i < res1.length)) {
|
||||
_context4.next = 24;
|
||||
_context4.next = 23;
|
||||
break;
|
||||
}
|
||||
item = res1[i];
|
||||
if (!(new Date(item.PRESALE_STARTTIME).getTime() < new Date().getTime() && new Date().getTime() < new Date(item.PRESALE_ENDTIME).getTime())) {
|
||||
_context4.next = 21;
|
||||
_context4.next = 20;
|
||||
break;
|
||||
}
|
||||
firstObj1 = item;
|
||||
return _context4.abrupt("break", 24);
|
||||
case 21:
|
||||
return _context4.abrupt("break", 23);
|
||||
case 20:
|
||||
i++;
|
||||
_context4.next = 16;
|
||||
_context4.next = 15;
|
||||
break;
|
||||
case 24:
|
||||
case 23:
|
||||
firstObj2 = {};
|
||||
if (!(res2 && res2.length > 0)) {
|
||||
_context4.next = 35;
|
||||
_context4.next = 34;
|
||||
break;
|
||||
}
|
||||
_i = 0;
|
||||
case 27:
|
||||
case 26:
|
||||
if (!(_i < res2.length)) {
|
||||
_context4.next = 35;
|
||||
_context4.next = 34;
|
||||
break;
|
||||
}
|
||||
_item = res2[_i];
|
||||
if (!(new Date(_item.PRESALE_STARTTIME).getTime() < new Date().getTime() && new Date().getTime() < new Date(_item.PRESALE_ENDTIME).getTime())) {
|
||||
_context4.next = 32;
|
||||
_context4.next = 31;
|
||||
break;
|
||||
}
|
||||
firstObj2 = _item;
|
||||
return _context4.abrupt("break", 35);
|
||||
case 32:
|
||||
return _context4.abrupt("break", 34);
|
||||
case 31:
|
||||
_i++;
|
||||
_context4.next = 27;
|
||||
_context4.next = 26;
|
||||
break;
|
||||
case 35:
|
||||
case 34:
|
||||
_this8.firstObj1 = firstObj1;
|
||||
if (firstObj1.USERDEFINEDTYPE_ICO) {
|
||||
// this.swiperList.unshift(firstObj1.USERDEFINEDTYPE_ICO)
|
||||
@ -964,7 +927,7 @@ var _default = {
|
||||
|
||||
// this.swiperList.unshift(res1[0].USERDEFINEDTYPE_ICO)
|
||||
// this.poster = res2[0]
|
||||
case 39:
|
||||
case 38:
|
||||
case "end":
|
||||
return _context4.stop();
|
||||
}
|
||||
@ -1903,75 +1866,6 @@ var _default = {
|
||||
while (1) {
|
||||
switch (_context11.prev = _context11.next) {
|
||||
case 0:
|
||||
// let start = `${this.$moment
|
||||
// .now()
|
||||
// .set("month", -1)
|
||||
// .format("YYYY-MM-DD")} 00:00:00`;
|
||||
// let end = `${this.$moment.now().format("YYYY-MM-DD")} 23:59:59`;
|
||||
// let params = {
|
||||
// startQueryTime: start, // 开始时间
|
||||
// endQueryTime: end, // 结束时间
|
||||
// };
|
||||
// let time = Math.ceil(new Date().getTime() / 1000);
|
||||
// let req = {
|
||||
// app_id: "530000301",
|
||||
// biz_content: JSON.stringify(params),
|
||||
// charset: "UTF-8",
|
||||
// pid: "530000301",
|
||||
// service: "trawe.eats.etc",
|
||||
// utc_timestamp: time,
|
||||
// version: "1.0",
|
||||
// sign_type: "RSA2",
|
||||
// };
|
||||
// let signText = `app_id=${req.app_id}&biz_content=${req.biz_content}&charset=UTF-8&pid=${req.app_id}&service=trawe.eats.etc&utc_timestamp=${req.utc_timestamp}&version=1.0`;
|
||||
// // 签名
|
||||
// const sign = await new Promise((resolve, reject) => {
|
||||
// uni.request({
|
||||
// url: "https://admin.es.eshangtech.com/prod-api/RSA/sign",
|
||||
// method: "POST",
|
||||
// data: {
|
||||
// originalText: signText,
|
||||
// privateKey:
|
||||
// "MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCtIkIJLbZYI9NvTRkRbqtjJ73gkAUJZBJw88Z+O8prX2HXMTIedmZZxTwbfM5kGpl9VmS0CY8QL0DnDsgHO8QnSDpN1jiqTD9lk1evycuF7ujmlOk/cJ5x2cLPn9rPIrQn1lxp9mBiO1m9vsrNOze/kx7wRyif/+hvn5Q9KtNEMy0K8oOE5vktnjkk1AhhXrTii9eIjOrO3pRgh9cFA9kqQpvD14CImD7tdCgyntKcYAB7rlin6a2N0yH9JJINjOyOiyHufP8sR7pb9VYXVYXukOCItdC9QQluQhSdyC/3BfZD5zV1A+X7pUle7dDLGG6aSZyCibg16siFIEX94KYfAgMBAAECggEAcP5uwrbGzvdywq06sxnbWTdSwQC9iMd7EaTH4xL6pOD3Zg6Be0givGvxMq9dtA94JUkBKE8kw5dTcHlBKxdiiZCmHK63BM4GgjCLhfrZjWvDLNn68KB7iCpq7j6R+6XWljlczvsxJGs/woqGqTMAy1MlWgPXC7Vk6ZTolpMglt0IJOzPtgJ66qU2CtNRjowkXSCHDO2RCjkmYcjU6W+eCvi9cXIXhLv5yra1PE0KOxn3NiEFwgGUXpu8LKqxuUfGLuHljoLxWV8EEfwZaWB6Wy1DHMMgxhKrO3xEmdMEqtvJmF98LRSYiJerkExY8Gdx8bkLPjlCLYKW4JVuPmyYgQKBgQD8l0lLtB94MQMib0t8RzqlbKcczTAkicjSms3/P4kwh50GC8OqwjJB75n4yQyDPgsjms/SnRMq1zjgm+MHSC4snpLCcvKFYLnvrslWGu/2lyUTwEwdUdQe1ILG4Y9NXKWg4zXpKfJ2Rz/cqw6bHGYhQWZ62AXQgiz+W7cIPrsHsQKBgQCveHGHF0WqtYAmrW7nf04PKmcJ5U2briYCWOtWJE5Mo5BYxsGLX6vI53DMNQ42hFk0ye61VNfcazAoGI3mM4+j6R9k3ek8EtkBYBro5eeoBtB7TMTJagQqzBLz316mJBsFmw3TiC9BzYhs3tKJnVxpfqXoqsyu2ZA6VG5Y/gXOzwKBgCbejPvmUvVm7WmOINqWB3NPXgPzm1X0EgA+rDZ8K3tZUxOMGeccDSnSWipLne5QTNyExThOzZVJG0qNEombVOeu2zyq/aECunoktnzWllim96CrdcsJPZAk+Z7rNOcdu6sfa7teph4HZs9pT00VOK4jZ0a+GV71uUDHEkplhNhxAoGAMDOi5BxFe/595KIR7C/xboMUaQh/iDuPn2dzxmcUx0LLPUfkFPhEBV1mhAIzFFDI/JJYK6HR5m/fe7Q7DritRbaddCTtlB4NVK5k1gOJ3oN4s9ZD3Jxt5p/GuQ1sP7F9Zs3QP4KSkL34MwgGx9zdbPFofACnV4TWdN+KrJGjYMsCgYAE0CMM7rYHGY3Vt3/WZZJ+DPlKE6Q+uvFDomtsB1IavCeEJyjBP9+GhBHat86aA3mCFjf4emj1or7OEgPc0gCMtKBG6m10CrzLjzdWnOTveqWVUW/FS2gf17cIO5/FK/4KmAjH/QN24KXm395Qu8C0UFfgA66yysakJFkvXVBiPg==",
|
||||
// },
|
||||
// header: {
|
||||
// "content-type": "application/json",
|
||||
// },
|
||||
// success(res) {
|
||||
// resolve(res.data.data);
|
||||
// },
|
||||
// });
|
||||
// });
|
||||
// req.sign = sign;
|
||||
// 推文数据
|
||||
// const tweetsData = await new Promise((resolve, reject) => {
|
||||
// uni.request({
|
||||
// url: `https://sxgzh.etclife.cn/etc/api/v1/gzh/point/tweets`,
|
||||
// method: "POST",
|
||||
// data: req,
|
||||
// header: {
|
||||
// "content-type": "application/x-www-form-urlencoded",
|
||||
// },
|
||||
// success(res) {
|
||||
// if (res.data.response.data) {
|
||||
// resolve(res.data.response.data.data.tweets);
|
||||
// } else {
|
||||
// resolve([])
|
||||
// }
|
||||
// // let data = res.data.CollectionObject;
|
||||
// // if (data && data.length > 0) {
|
||||
// // resolve(data);
|
||||
// // } else {
|
||||
// // resolve([]);
|
||||
// // }
|
||||
// },
|
||||
// });
|
||||
// });
|
||||
// if (tweetsData && tweetsData.length > 0) {
|
||||
// this.roadStatusList = tweetsData;
|
||||
// } else {
|
||||
// this.roadStatusList = [];
|
||||
// }
|
||||
newReq = {
|
||||
SearchParameter: {
|
||||
// NOTICEINFO_TYPES: 1010,
|
||||
@ -1986,16 +1880,8 @@ var _default = {
|
||||
return _this18.$api.$post("/EShangApiMain/Notice/GetNOTICEINFOList", newReq);
|
||||
case 3:
|
||||
newData = _context11.sent;
|
||||
list = newData.Result_Data.List; // if (list && list.length > 0) {
|
||||
// } else {
|
||||
// this.roadStatusList = [];
|
||||
// }
|
||||
// this.roadStatusList = list.concat(tweetsData);
|
||||
list = newData.Result_Data.List;
|
||||
_this18.roadStatusList = list;
|
||||
|
||||
// this.roadStatusList.unshift({
|
||||
// NOTICEINFO_TITLE: "最新放假通知：调休2天，免费8天！",
|
||||
// });
|
||||
case 6:
|
||||
case "end":
|
||||
return _context11.stop();
|
||||
|
||||
@ -165,6 +165,8 @@ Object.defineProperty(exports, "__esModule", {
|
||||
value: true
|
||||
});
|
||||
exports.default = void 0;
|
||||
var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 30));
|
||||
var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 32));
|
||||
var _defineProperty2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/defineProperty */ 11));
|
||||
var _vuex = __webpack_require__(/*! vuex */ 33);
|
||||
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
||||
@ -188,6 +190,7 @@ var _default = {
|
||||
// saleBillId: '',
|
||||
imageArr: []
|
||||
},
|
||||
orderStatus: 0,
|
||||
noPost: true,
|
||||
storeMsg: {},
|
||||
imgsList: [],
|
||||
@ -212,6 +215,31 @@ var _default = {
|
||||
}
|
||||
}),
|
||||
methods: {
|
||||
// 把订单同步到 4000 已评价的状态
|
||||
updateOrderStatus: function updateOrderStatus() {
|
||||
var _this2 = this;
|
||||
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
|
||||
var req;
|
||||
return _regenerator.default.wrap(function _callee$(_context) {
|
||||
while (1) {
|
||||
switch (_context.prev = _context.next) {
|
||||
case 0:
|
||||
req = {
|
||||
action_type: "UpdateOrderState",
|
||||
action_data: _this2.proMsg.SALEBILL_ID,
|
||||
saleBillChildId: _this2.proMsg.SALEBILL_CHILD_ID || "",
|
||||
SALEBILL_STATE: _this2.orderStatus === 4000 || _this2.orderStatus === 5000 ? 5000 : 4000
|
||||
};
|
||||
_context.next = 3;
|
||||
return _this2.$api.getCoop(req);
|
||||
case 3:
|
||||
case "end":
|
||||
return _context.stop();
|
||||
}
|
||||
}
|
||||
}, _callee);
|
||||
}))();
|
||||
},
|
||||
isAnonymous: function isAnonymous(event, item) {
|
||||
console.log('eventevent', event);
|
||||
|
||||
@ -369,13 +397,16 @@ var _default = {
|
||||
uni.showToast({
|
||||
title: "评价成功！"
|
||||
});
|
||||
if (_this.proMsg.SALEBILL_ID) {
|
||||
_this.updateOrderStatus();
|
||||
}
|
||||
setTimeout(function () {
|
||||
var i = 2;
|
||||
if (_this.saveMsg.merchantsId) {
|
||||
i = 1;
|
||||
}
|
||||
// let i = 2;
|
||||
// if (_this.saveMsg.merchantsId) {
|
||||
// i = 1;
|
||||
// }
|
||||
uni.navigateBack({
|
||||
delta: i
|
||||
delta: 1
|
||||
});
|
||||
}, 1000);
|
||||
} else {
|
||||
@ -445,6 +476,9 @@ var _default = {
|
||||
this.saveMsg.salebillId = option.orderInternal;
|
||||
this.saveMsg.action_type = "addMallComment";
|
||||
}
|
||||
if (option.orderStatus) {
|
||||
this.orderStatus = Number(option.orderStatus);
|
||||
}
|
||||
this.$utils.addUserBehaviorNew();
|
||||
}
|
||||
};
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{
|
||||
"usingComponents": {},
|
||||
"component": true
|
||||
"component": true,
|
||||
"usingComponents": {}
|
||||
}
|
||||
@ -307,7 +307,7 @@ var _default = {
|
||||
this.pageType = query.pageType;
|
||||
}
|
||||
console.log("this.currentTab", this.currentTab);
|
||||
var type = this.currentTab === 1 ? "1005,1010,2010,3000,8000,8010,8020,8900,8999,9000,9999" : this.currentTab === 2 ? "1005" : this.currentTab === 3 ? "1010,2000" : this.currentTab === 4 ? "2010" : this.currentTab === 5 ? "3000" : this.currentTab === 7 ? "8000,8010,8020,8900" : "";
|
||||
var type = this.currentTab === 1 ? "1005,1010,2010,3000,4000,5000,8000,8010,8020,8900,8999,9000,9999" : this.currentTab === 2 ? "1005" : this.currentTab === 3 ? "1010,2000" : this.currentTab === 4 ? "2010" : this.currentTab === 5 ? "3000,4000,5000" : this.currentTab === 7 ? "8000,8010,8020,8900" : "";
|
||||
// 获取订单数据
|
||||
this.handleGetOrderList(type);
|
||||
|
||||
@ -328,7 +328,7 @@ var _default = {
|
||||
if (_this2.isFirst) {
|
||||
_this2.isFirst = false;
|
||||
} else {
|
||||
type = _this2.currentTab === 1 ? "1005,1010,2010,3000,8000,8010,8020,8900,8999,9000,9999" : _this2.currentTab === 2 ? "1005" : _this2.currentTab === 3 ? "1010,2000" : _this2.currentTab === 4 ? "2010" : _this2.currentTab === 5 ? "3000" : _this2.currentTab === 7 ? "8000,8010,8020,8900" : "";
|
||||
type = _this2.currentTab === 1 ? "1005,1010,2010,3000,4000,5000,8000,8010,8020,8900,8999,9000,9999" : _this2.currentTab === 2 ? "1005" : _this2.currentTab === 3 ? "1010,2000" : _this2.currentTab === 4 ? "2010" : _this2.currentTab === 5 ? "3000,4000,5000" : _this2.currentTab === 7 ? "8000,8010,8020,8900" : "";
|
||||
req = {
|
||||
action_type: "GetOrderList",
|
||||
salebillType: _this2.searchType === "6" ? _this2.selectBigTab === 1 ? '3001,3999' : _this2.selectBigTab === 2 ? '3999' : _this2.selectBigTab === 3 ? '3001' : '' : _this2.selectBigTab === 1 ? '3000,3001,3002' : _this2.selectBigTab === 2 ? '3000,3002' : _this2.selectBigTab === 3 ? '3001' : '',
|
||||
@ -374,7 +374,7 @@ var _default = {
|
||||
console.log("obj", obj);
|
||||
console.log("shopObj", shopObj);
|
||||
uni.navigateTo({
|
||||
url: "/pages/newEvaluate/index?sellchildid=" + obj.SALEBILL_CHILD_ID + "&orderInternal=" + obj.SALEBILL_ID + "&proid=" + shopObj.COMMODITY_ID
|
||||
url: "/pages/newEvaluate/index?sellchildid=" + obj.SALEBILL_CHILD_ID + "&orderInternal=" + obj.SALEBILL_ID + "&proid=" + shopObj.COMMODITY_ID + "&orderStatus=" + obj.SALEBILL_STATE
|
||||
// +
|
||||
// "type=" +
|
||||
// "DeliverId"
|
||||
@ -524,7 +524,7 @@ var _default = {
|
||||
title: "收货成功！",
|
||||
icon: 'none'
|
||||
});
|
||||
type = this.currentTab === 1 ? "1005,1010,2010,3000,8000,8010,8020,8900,8999,9000,9999" : this.currentTab === 2 ? "1005" : this.currentTab === 3 ? "1010,2000" : this.currentTab === 4 ? "2010" : this.currentTab === 5 ? "3000" : this.currentTab === 7 ? "8000,8010,8020,8900" : "";
|
||||
type = this.currentTab === 1 ? "1005,1010,2010,3000,4000,5000,8000,8010,8020,8900,8999,9000,9999" : this.currentTab === 2 ? "1005" : this.currentTab === 3 ? "1010,2000" : this.currentTab === 4 ? "2010" : this.currentTab === 5 ? "3000,4000,5000" : this.currentTab === 7 ? "8000,8010,8020,8900" : "";
|
||||
_this.handleGetOrderList(type);
|
||||
}
|
||||
_context3.next = 10;
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -297,7 +297,7 @@ var _default = {
|
||||
imageLoadedMap: {},
|
||||
lastStartIndex: 0,
|
||||
hasWatched: 0,
|
||||
shopTopId: '',
|
||||
shopTopId: "",
|
||||
comeForm: "",
|
||||
// 来自
|
||||
comeService: "",
|
||||
@ -345,14 +345,13 @@ var _default = {
|
||||
},
|
||||
rightShopList: {
|
||||
handler: function handler(newVal, oldVal) {
|
||||
// // 商品变了 我要把可视区域内容的 选购了多少个 也修改掉
|
||||
// // 商品变了 我要把可视区域内容的 选购了多少个 也修改掉
|
||||
// if (this.visibleList && this.visibleList.length > 0) {
|
||||
// let newVisibleList = []
|
||||
// this.visibleList.forEach((item) => {
|
||||
// if (newVal && newVal.length > 0) {
|
||||
// newVal.forEach((subItem) => {
|
||||
// if (item.COMMODITY_ID === subItem.COMMODITY_ID) {
|
||||
|
||||
// newVisibleList.push({
|
||||
// ...subItem,
|
||||
// })
|
||||
@ -378,14 +377,14 @@ var _default = {
|
||||
onLoad: function onLoad(query) {
|
||||
var _this2 = this;
|
||||
// 初始化骨架屏控制
|
||||
this.skeletonControl = (0, _skeletonManager.useSkeletonControl)('/pages/shopMallPage/shopType/index', query.pageType);
|
||||
this.skeletonControl = (0, _skeletonManager.useSkeletonControl)("/pages/shopMallPage/shopType/index", query.pageType);
|
||||
this.showContent = this.skeletonControl.showContent;
|
||||
this.isFirstLoad = this.skeletonControl.showSkeleton;
|
||||
var systemInfo = uni.getSystemInfoSync();
|
||||
this.systemInfo = systemInfo;
|
||||
var height = uni.getStorageSync("safeHeight");
|
||||
this.safeHeight = Number(height);
|
||||
console.log('queryqueryquery', query);
|
||||
console.log("queryqueryquery", query);
|
||||
if (query.selectIndex) {
|
||||
this.activeTabs = Number(query.selectIndex);
|
||||
}
|
||||
@ -449,7 +448,7 @@ var _default = {
|
||||
this.isFirstLoad = false;
|
||||
}
|
||||
this.$utils.addUserBehaviorNew({
|
||||
behaviorRecordDesc: this.pageType ? '进入工会商城分类页' : "进入精选商城分类页"
|
||||
behaviorRecordDesc: this.pageType ? "进入工会商城分类页" : "进入精选商城分类页"
|
||||
});
|
||||
},
|
||||
onShow: function onShow() {
|
||||
@ -536,7 +535,7 @@ var _default = {
|
||||
switch (_context2.prev = _context2.next) {
|
||||
case 0:
|
||||
uni.showLoading({
|
||||
title: '加载中...'
|
||||
title: "加载中..."
|
||||
});
|
||||
if (!(_this3.pageType === "UnionMall")) {
|
||||
_context2.next = 6;
|
||||
@ -654,7 +653,7 @@ var _default = {
|
||||
|
||||
if (!item) return "/static/images/home/defultImg.png?v=".concat(version);
|
||||
if (item.IMAGE_PATH) {
|
||||
var arr = item.IMAGE_PATH.split(',');
|
||||
var arr = item.IMAGE_PATH.split(",");
|
||||
var base = arr.length > 1 ? arr[0] : item.IMAGE_PATH;
|
||||
return "".concat(base, "?v=").concat(version);
|
||||
} else {
|
||||
@ -831,7 +830,7 @@ var _default = {
|
||||
switch (_context3.prev = _context3.next) {
|
||||
case 0:
|
||||
_context3.next = 2;
|
||||
return _this6.$api.$javaGet('/third-party/getWeChatGetMallGoodsType', {
|
||||
return _this6.$api.$javaGet("/third-party/getWeChatGetMallGoodsType", {
|
||||
ownerUnitId: 911,
|
||||
appId: "wxee018fb96955552a",
|
||||
commodityNature: 5070
|
||||
@ -853,7 +852,7 @@ var _default = {
|
||||
}
|
||||
});
|
||||
}
|
||||
console.log('resListresListresList', resList);
|
||||
console.log("resListresListresList", resList);
|
||||
_this6.shopTypeList = resList;
|
||||
_this6.handleGetAllShopItem(resList[_this6.activeTabs].UserdefinedType_Id);
|
||||
case 10:
|
||||
@ -888,7 +887,7 @@ var _default = {
|
||||
// payMethod: "1000,3000",
|
||||
// // justCommodity: 1,
|
||||
// });
|
||||
url = _this7.pageType === "UnionMall" ? '/third-party/getWeChatGetMallGoodsInfo' : '/third-party/getWeChatGetMallGoodsInfoExclude';
|
||||
url = _this7.pageType === "UnionMall" ? "/third-party/getWeChatGetMallGoodsInfo" : "/third-party/getWeChatGetMallGoodsInfoExclude";
|
||||
_context4.next = 5;
|
||||
return _this7.$api.$javaGet(
|
||||
// '/third-party/getExcludeWeChatGetMallGoodsInfo',
|
||||
@ -986,7 +985,7 @@ var _default = {
|
||||
break;
|
||||
}
|
||||
typeList = getWeChatGetMallGoodsType;
|
||||
_this8.$api.$javaGet('/third-party/getWeChatGetMallGoodsType', {
|
||||
_this8.$api.$javaGet("/third-party/getWeChatGetMallGoodsType", {
|
||||
ownerUnitId: 911,
|
||||
appId: "wxee018fb96955552a",
|
||||
commodityNature: _this8.pageType === "UnionMall" ? "" : 5070
|
||||
@ -1001,7 +1000,7 @@ var _default = {
|
||||
break;
|
||||
case 8:
|
||||
_context5.next = 10;
|
||||
return _this8.$api.$javaGet('/third-party/getWeChatGetMallGoodsType', {
|
||||
return _this8.$api.$javaGet("/third-party/getWeChatGetMallGoodsType", {
|
||||
ownerUnitId: 911,
|
||||
appId: "wxee018fb96955552a",
|
||||
commodityNature: _this8.pageType === "UnionMall" ? "" : 5070
|
||||
@ -1069,7 +1068,7 @@ var _default = {
|
||||
excludeNature: _this9.pageType === "UnionMall" ? "" : 5070,
|
||||
commodityNature: _this9.pageType === "UnionMall" ? 5070 : "",
|
||||
// justCommodity: 1,
|
||||
sortStr: "".concat(_this9.selectShopSort === 0 ? 'COMMODITY_INDEX,COMMODITY_EN,COMMODITY_MEMBERPRICE,OPERATE_DATE' : _this9.selectShopSort === 1 ? 'COMMODITY_MEMBERPRICE' : _this9.selectShopSort === 2 ? 'COMMODITY_EN' : _this9.selectShopSort === 3 ? 'OPERATE_DATE' : '', " ").concat(_this9.selectSortType === 0 ? 'asc' : 'desc')
|
||||
sortStr: "".concat(_this9.selectShopSort === 0 ? "COMMODITY_INDEX,COMMODITY_EN,COMMODITY_MEMBERPRICE,OPERATE_DATE" : _this9.selectShopSort === 1 ? "COMMODITY_MEMBERPRICE" : _this9.selectShopSort === 2 ? "COMMODITY_EN" : _this9.selectShopSort === 3 ? "OPERATE_DATE" : "", " ").concat(_this9.selectSortType === 0 ? "asc" : "desc")
|
||||
});
|
||||
case 3:
|
||||
data = _context6.sent;
|
||||
@ -1089,8 +1088,8 @@ var _default = {
|
||||
// )
|
||||
// uni.hideLoading()
|
||||
list = data.Data.List;
|
||||
console.log('ididid', id);
|
||||
console.log('listlistlistlist', JSON.parse(JSON.stringify(list)));
|
||||
console.log("ididid", id);
|
||||
console.log("listlistlistlist", JSON.parse(JSON.stringify(list)));
|
||||
thisAllType = [];
|
||||
if (_this9.shopTypeList && _this9.shopTypeList.length > 0) {
|
||||
_this9.shopTypeList.forEach(function (item) {
|
||||
@ -1100,7 +1099,7 @@ var _default = {
|
||||
});
|
||||
}
|
||||
haveAll = false;
|
||||
console.log('thisAllTypethisAllType', JSON.parse(JSON.stringify(thisAllType)));
|
||||
console.log("thisAllTypethisAllType", JSON.parse(JSON.stringify(thisAllType)));
|
||||
|
||||
// 添加一个子类的全部
|
||||
list.unshift({
|
||||
@ -1121,8 +1120,8 @@ var _default = {
|
||||
UserdefinedType_Id: -1
|
||||
});
|
||||
}
|
||||
console.log('thisAllTypethisAllTypethisAllType', JSON.parse(JSON.stringify(thisAllType)));
|
||||
console.log('this.leftIdthis.leftIdthis.leftId', JSON.parse(JSON.stringify(_this9.leftId)));
|
||||
console.log("thisAllTypethisAllTypethisAllType", JSON.parse(JSON.stringify(thisAllType)));
|
||||
console.log("this.leftIdthis.leftIdthis.leftId", JSON.parse(JSON.stringify(_this9.leftId)));
|
||||
leftIndex = -1; // if (this.pageType === "UnionMall" && this.leftId) {
|
||||
// if (thisAllType && thisAllType.length > 0) {
|
||||
// thisAllType.forEach((item, index) => {
|
||||
@ -1131,7 +1130,7 @@ var _default = {
|
||||
// }
|
||||
// });
|
||||
// }
|
||||
// } else
|
||||
// } else
|
||||
if (_this9.comeService) {
|
||||
if (thisAllType && thisAllType.length > 0) {
|
||||
thisAllType.forEach(function (item, index) {
|
||||
@ -1141,21 +1140,21 @@ var _default = {
|
||||
});
|
||||
}
|
||||
}
|
||||
console.log('leftIndexleftIndexleftIndex', JSON.parse(JSON.stringify(leftIndex)));
|
||||
console.log("leftIndexleftIndexleftIndex", JSON.parse(JSON.stringify(leftIndex)));
|
||||
if (leftIndex === -1) {
|
||||
leftIndex = _this9.leftSelectIndex;
|
||||
}
|
||||
|
||||
// 当前选中的商品列表
|
||||
shopList = [];
|
||||
console.log('listlistlistlistlist', JSON.parse(JSON.stringify(list)));
|
||||
console.log("listlistlistlistlist", JSON.parse(JSON.stringify(list)));
|
||||
if (list && list.length > 0) {
|
||||
// 这一大类的全部商品
|
||||
thisTypeAllShop = []; // 当前的全部商品id
|
||||
allShopID = [];
|
||||
list.forEach(function (item) {
|
||||
if (item.UserdefinedType_Name !== "全部") {
|
||||
//
|
||||
//
|
||||
if (item.COMMODITYLIST && item.COMMODITYLIST.length > 0 && (item.USERDEFINEDTYPE_PID === id || item.USERDEFINEDTYPE_ID === id)) {
|
||||
item.COMMODITYLIST.forEach(function (subItem) {
|
||||
if (allShopID.indexOf(subItem.COMMODITY_ID) === -1) {
|
||||
@ -1166,12 +1165,12 @@ var _default = {
|
||||
}
|
||||
}
|
||||
});
|
||||
console.log('thisTypeAllShopthisTypeAllShop', JSON.parse(JSON.stringify(thisTypeAllShop)));
|
||||
console.log('allShopIDallShopIDallShopIDallShopID', JSON.parse(JSON.stringify(allShopID)));
|
||||
console.log("thisTypeAllShopthisTypeAllShop", JSON.parse(JSON.stringify(thisTypeAllShop)));
|
||||
console.log("allShopIDallShopIDallShopIDallShopID", JSON.parse(JSON.stringify(allShopID)));
|
||||
list[0].COMMODITYLIST = thisTypeAllShop;
|
||||
console.log('listlistlistlistlistlist', JSON.parse(JSON.stringify(list)));
|
||||
console.log('leftIndexleftIndexleftIndex', JSON.parse(JSON.stringify(leftIndex)));
|
||||
console.log('this.leftIdthis.leftIdthis.leftIdthis.leftId', JSON.parse(JSON.stringify(_this9.leftId)));
|
||||
console.log("listlistlistlistlistlist", JSON.parse(JSON.stringify(list)));
|
||||
console.log("leftIndexleftIndexleftIndex", JSON.parse(JSON.stringify(leftIndex)));
|
||||
console.log("this.leftIdthis.leftIdthis.leftIdthis.leftId", JSON.parse(JSON.stringify(_this9.leftId)));
|
||||
if (leftIndex !== -1 && list[leftIndex] && list[leftIndex].COMMODITYLIST && list[leftIndex].COMMODITYLIST.length > 0) {
|
||||
if (_this9.pageType === "UnionMall" && _this9.leftId) {
|
||||
if (_this9.leftId) {
|
||||
@ -1194,7 +1193,7 @@ var _default = {
|
||||
shopList = list[leftIndex].COMMODITYLIST;
|
||||
}
|
||||
}
|
||||
console.log('222222', JSON.parse(JSON.stringify(shopList)));
|
||||
console.log("222222", JSON.parse(JSON.stringify(shopList)));
|
||||
if (shopList && shopList.length > 0) {
|
||||
shopList.forEach(function (item) {
|
||||
// 判断当前的购物车里面 是不是已经有数据了 有数据的话 把原本的商品数量赋值进去
|
||||
@ -1267,7 +1266,7 @@ var _default = {
|
||||
}
|
||||
newList[0].COMMODITYLIST = allShopList;
|
||||
_this9.leftTypeList = newList;
|
||||
console.log('shopListshopListshopList', JSON.parse(JSON.stringify(shopList)));
|
||||
console.log("shopListshopListshopList", JSON.parse(JSON.stringify(shopList)));
|
||||
_this9.leftSelectIndex = leftIndex;
|
||||
_this9.rightShopList = shopList;
|
||||
_this9.visibleList = shopList.slice(0, _this9.visibleCount + _this9.buffer * 2);
|
||||
@ -1385,7 +1384,7 @@ var _default = {
|
||||
this.leftToView = "left_".concat(index, "_") + this.leftTypeList[index].USERDEFINEDTYPE_ID;
|
||||
this.leftSelectIndex = index;
|
||||
var shopList = this.leftTypeList[index].COMMODITYLIST;
|
||||
console.log('shopListshopList', shopList);
|
||||
console.log("shopListshopList", shopList);
|
||||
if (shopList && shopList.length > 0) {
|
||||
shopList.forEach(function (item) {
|
||||
// 判断当前的购物车里面 是不是已经有数据了 有数据的话 把原本的商品数量赋值进去
|
||||
@ -1419,11 +1418,11 @@ var _default = {
|
||||
this.visibleList = [];
|
||||
}
|
||||
this.startIndex = 0;
|
||||
this.shopTopId = 'shopTop';
|
||||
this.shopTopId = "shopTop";
|
||||
this.$forceUpdate();
|
||||
var _this = this;
|
||||
setTimeout(function () {
|
||||
_this.shopTopId = '';
|
||||
_this.shopTopId = "";
|
||||
}, 1000);
|
||||
}), (0, _defineProperty2.default)(_methods, "handleShowPopup", function handleShowPopup(obj) {
|
||||
var currentShop = JSON.parse(JSON.stringify(obj));
|
||||
@ -1540,7 +1539,7 @@ var _default = {
|
||||
this.leftTypeList[this.leftSelectIndex].COMMODITYLIST = nowShopList;
|
||||
this.$forceUpdate();
|
||||
}), (0, _defineProperty2.default)(_methods, "handleBackHome", function handleBackHome() {
|
||||
console.log('this.pageTypethis.pageType', this.pageType);
|
||||
console.log("this.pageTypethis.pageType", this.pageType);
|
||||
if (this.pageType === "UnionMall") {
|
||||
uni.switchTab({
|
||||
url: "/pages/shopMallPage/tradeUnionMall/index"
|
||||
@ -1594,7 +1593,7 @@ var _default = {
|
||||
ownerUnitId: 911,
|
||||
justCommodity: 1,
|
||||
payMethod: "2000,3000",
|
||||
excludeNature: _this13.user.INDUSTRY_MEMBERSHIP_ID ? '' : 5070
|
||||
excludeNature: _this13.user.INDUSTRY_MEMBERSHIP_ID ? "" : 5070
|
||||
};
|
||||
_context8.next = 3;
|
||||
return _this13.$api.getCoop(req);
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -1,7 +1,7 @@
|
||||
.main.data-v-36e5d840 {
|
||||
width: 100vw;
|
||||
height: 100vh;
|
||||
background-image: url('https://eshangtech.com/minTestImg/unionMallBg.png');
|
||||
background-image: url("https://eshangtech.com/minTestImg/unionMallBg.png");
|
||||
background-size: 100% 100vh;
|
||||
background-repeat: no-repeat;
|
||||
}
|
||||
@ -110,9 +110,10 @@
|
||||
color: #fdfdfd;
|
||||
line-height: 20px;
|
||||
padding: 7px 16px;
|
||||
background: linear-gradient(270deg, #FB6C6C 0%, #FF4545 100%);
|
||||
background: linear-gradient(270deg, #fb6c6c 0%, #ff4545 100%);
|
||||
border-radius: 17px;
|
||||
text-align: center;
|
||||
white-space: nowrap;
|
||||
width: 60rpx;
|
||||
}
|
||||
.main .header .shopLovelyRight.data-v-36e5d840 {
|
||||
@ -232,11 +233,11 @@
|
||||
overflow: hidden;
|
||||
}
|
||||
.main .pageContent .bigTabBox .scrollBox .bigTabItem .itemBox .tab_active.data-v-36e5d840 {
|
||||
border: 1px solid #E43C3D;
|
||||
border: 1px solid #e43c3d;
|
||||
}
|
||||
.main .pageContent .bigTabBox .scrollBox .bigTabItem .itemBox .tab_txt_active.data-v-36e5d840 {
|
||||
padding: 0 5px;
|
||||
background: #E43C3D;
|
||||
background: #e43c3d;
|
||||
border-radius: 8px;
|
||||
color: #fff !important;
|
||||
}
|
||||
@ -304,7 +305,7 @@
|
||||
background: #fff;
|
||||
}
|
||||
.main .pageContent .shopListBox .smallShopList .scrollShopBox .selectShopItem .smallItemTitle.data-v-36e5d840 {
|
||||
color: #E43C3D;
|
||||
color: #e43c3d;
|
||||
}
|
||||
.main .pageContent .shopListBox .smallShopList .scrollShopBox .selectShopItem.data-v-36e5d840:before {
|
||||
content: "";
|
||||
@ -315,7 +316,7 @@
|
||||
top: 50%;
|
||||
-webkit-transform: translateY(-50%);
|
||||
transform: translateY(-50%);
|
||||
background: #E43C3D;
|
||||
background: #e43c3d;
|
||||
}
|
||||
.main .pageContent .shopListBox .smallShopList .scrollShopBox.data-v-36e5d840 ::-webkit-scrollbar {
|
||||
display: none;
|
||||
@ -844,7 +845,7 @@
|
||||
border-radius: 16rpx;
|
||||
}
|
||||
.newMain.data-v-36e5d840 {
|
||||
background-image: url('https://eshangtech.com/minTestImg/pageBg.png');
|
||||
background-image: url("https://eshangtech.com/minTestImg/pageBg.png");
|
||||
background-size: 100% 100vh;
|
||||
background-repeat: no-repeat;
|
||||
}
|
||||
@ -852,14 +853,14 @@
|
||||
background: transparent !important;
|
||||
}
|
||||
.newMain .header .pageSearch .searchBtn.data-v-36e5d840 {
|
||||
background: #4BCB7E !important;
|
||||
background: #4bcb7e !important;
|
||||
}
|
||||
.newMain .pageContent .bigTabBox .scrollBox .bigTabItem .itemBox .tab_active.data-v-36e5d840 {
|
||||
border: 1px solid #4BCB7E;
|
||||
border: 1px solid #4bcb7e;
|
||||
}
|
||||
.newMain .pageContent .bigTabBox .scrollBox .bigTabItem .itemBox .tab_txt_active.data-v-36e5d840 {
|
||||
padding: 0 5px;
|
||||
background: #4BCB7E;
|
||||
background: #4bcb7e;
|
||||
border-radius: 8px;
|
||||
color: #fff !important;
|
||||
}
|
||||
@ -867,7 +868,7 @@
|
||||
background: #fff;
|
||||
}
|
||||
.newMain .pageContent .shopListBox .smallShopList .scrollShopBox .selectShopItem .smallItemTitle.data-v-36e5d840 {
|
||||
color: #4BCB7E;
|
||||
color: #4bcb7e;
|
||||
}
|
||||
.newMain .pageContent .shopListBox .smallShopList .scrollShopBox .selectShopItem.data-v-36e5d840:before {
|
||||
content: "";
|
||||
@ -878,7 +879,7 @@
|
||||
top: 50%;
|
||||
-webkit-transform: translateY(-50%);
|
||||
transform: translateY(-50%);
|
||||
background: #4BCB7E;
|
||||
background: #4bcb7e;
|
||||
}
|
||||
/* 商品分类页面骨架屏样式 */
|
||||
.shop-type-skeleton.data-v-36e5d840 {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{
|
||||
"usingComponents": {},
|
||||
"component": true
|
||||
"component": true,
|
||||
"usingComponents": {}
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
{
|
||||
"usingComponents": {},
|
||||
"component": true
|
||||
"component": true,
|
||||
"usingComponents": {}
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
{
|
||||
"usingComponents": {},
|
||||
"component": true
|
||||
"component": true,
|
||||
"usingComponents": {}
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
{
|
||||
"usingComponents": {},
|
||||
"component": true
|
||||
"component": true,
|
||||
"usingComponents": {}
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
{
|
||||
"usingComponents": {},
|
||||
"component": true
|
||||
"component": true,
|
||||
"usingComponents": {}
|
||||
}
|
||||
@ -3,7 +3,7 @@
|
||||
"projectname": "caiyunyi",
|
||||
"setting": {
|
||||
"compileHotReLoad": true,
|
||||
"urlCheck": true
|
||||
"urlCheck": false
|
||||
},
|
||||
"condition": {
|
||||
"miniprogram": {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"component": true,
|
||||
"usingComponents": {
|
||||
"uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
|
||||
},
|
||||
"component": true
|
||||
}
|
||||
}
|
||||
@ -186,7 +186,7 @@ export function addUserBehaviorNew(obj) {
|
||||
? `recommendId=${app.globalData.recommendId}&recommendCode=${app.globalData.recommendCode}`
|
||||
: ''),
|
||||
LoginIP: userInfo?.ip || '',
|
||||
LoginPlace: (userInfo?.prov || '') + (userInfo?.prov && userInfo?.city ? '-' : '') + (userInfo?.city || ''),
|
||||
LoginPlace: `${userInfo.prov ? userInfo.prov : ''}${userInfo.prov && userInfo.city ? '-' : ''}${userInfo.city ? userInfo.city : ''}${userInfo.prov && userInfo.city && userInfo.district ? '-' : ''}${userInfo.district ? userInfo.district : ''}`,
|
||||
OperatingSystem: '彩云驿出行',
|
||||
};
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user