ylj/caiyunyi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

域名更换

Browse Source
This commit is contained in:
ylj20011123 2025-09-30 09:26:10 +08:00
parent e7438abac8
commit f3154da923
85 changed files with 326 additions and 253 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
App.vue
View File

@ -22,7 +22,7 @@ export default {
console.log('应用启动时间:', this.globalData.appLaunchTime)
this.setVisitChannels(options.scene);
this.handleGetUserInfo();
// this.handleGetUserInfo();
let _this = this;
uni.getSystemInfo({
success: (res) => {

6
pages/complaints/addComplaints.vue
View File

@ -418,7 +418,7 @@ export default {
for (let i = 0; i < tempFilePath.length; i++) {
let videoItem = tempFilePath[i].tempFilePath
uni.uploadFile({
url: 'https://mp.eshangtech.com/Coop.Merchant/Handler/handler_ajax.ashx?action_type=UploadFile&folder=suggestion',
url: 'https://eshangtech.com:18998/Coop.Merchant/Handler/handler_ajax.ashx?action_type=UploadFile&folder=suggestion',
// filePath: res.tempFilePath,
filePath: videoItem,
name: 'data',
@ -484,7 +484,7 @@ export default {
mask: true
})
uni.uploadFile({
url: 'https://mp.eshangtech.com/Coop.Merchant/Handler/handler_ajax.ashx?action_type=UploadFile&folder=suggestion',
url: 'https://eshangtech.com:18998/Coop.Merchant/Handler/handler_ajax.ashx?action_type=UploadFile&folder=suggestion',
// filePath: res.tempFilePath,
filePath: imgInfo.path,
name: 'data',
@ -513,7 +513,7 @@ export default {
mask: true
})
uni.uploadFile({
url: 'https://mp.eshangtech.com/Coop.Merchant/Handler/handler_ajax.ashx?action_type=UploadFile&folder=suggestion',
url: 'https://eshangtech.com:18998/Coop.Merchant/Handler/handler_ajax.ashx?action_type=UploadFile&folder=suggestion',
// filePath: tempFilePath,
filePath: imgInfo.path,
name: 'data',

4
pages/evaluateList/addEvaluate.vue
View File

@ -135,7 +135,7 @@ export default {
// mask: true
});
uni.uploadFile({
url: "https://mp.eshangtech.com/Coop.Merchant/Handler/handler_ajax.ashx?action_type=UploadFile&folder=Comment",
url: "https://eshangtech.com:18998/Coop.Merchant/Handler/handler_ajax.ashx?action_type=UploadFile&folder=Comment",
filePath: rs.tempFiles[0].tempFilePath,
fileType: "image",
name: "data",
@ -164,7 +164,7 @@ export default {
// mask: true
});
uni.uploadFile({
url: "https://mp.eshangtech.com/Coop.Merchant/Handler/handler_ajax.ashx?action_type=UploadFile&folder=Comment",
url: "https://eshangtech.com:18998/Coop.Merchant/Handler/handler_ajax.ashx?action_type=UploadFile&folder=Comment",
filePath: rs.tempFiles[0].tempFilePath,
fileType: "image",
name: "data",

42
pages/index/index.vue
View File

@ -1900,29 +1900,29 @@ export default {
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);
// 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([]);
// resolve([])
// }
},
});
});
// // let data = res.data.CollectionObject;
// // if (data && data.length > 0) {
// // resolve(data);
// // } else {
// // resolve([]);
// // }
// },
// });
// });
// if (tweetsData && tweetsData.length > 0) {
// this.roadStatusList = tweetsData;

4
pages/newEvaluate/index.vue
View File

@ -133,7 +133,7 @@ export default {
// mask: true
});
uni.uploadFile({
url: "https://user.eshangtech.com/Coop.Merchant/Handler/handler_ajax.ashx?action_type=UploadFile&folder=Comment",
url: "https://eshangtech.com:18999/Coop.Merchant/Handler/handler_ajax.ashx?action_type=UploadFile&folder=Comment",
filePath: res.tempFilePath,
fileType: "image",
name: "data",
@ -161,7 +161,7 @@ export default {
// mask: true
});
uni.uploadFile({
url: "https://user.eshangtech.com/Coop.Merchant/Handler/handler_ajax.ashx?action_type=UploadFile&folder=Comment",
url: "https://eshangtech.com:18999/Coop.Merchant/Handler/handler_ajax.ashx?action_type=UploadFile&folder=Comment",
filePath: rs.tempFilePaths[0],
fileType: "image",
name: "data",

2
pages/order/orderFoodDetail/index.vue
View File

@ -347,7 +347,7 @@ export default {
description: "彩云驿出行", //商品描述
out_trade_no: out_trade_no, // 商户订单号
notify_url:
"https://mp.eshangtech.com/Coop.Merchant/Handler/Handler_Trade.ashx", // 商户回调地址
"https://eshangtech.com:18998/Coop.Merchant/Handler/Handler_Trade.ashx", // 商户回调地址
amount: {
total: payMoney
? payMoney * 100

13
pages/order/orderdetail/index.vue
View File

@ -127,12 +127,20 @@
<p class="order-info-type">
<span class="order-info-t">预约电话</span><span>{{ orderInfo.ORDER_PERSONTEL }}</span>
</p>
<p class="order-info-type">
<span class="order-info-t">收货地址</span><span
style="line-height: 30rpx;text-align: right;flex: 1; min-width: 0;">{{ `${orderInfo.AddressInfo.ADDRESS
? orderInfo.AddressInfo.ADDRESS : ""}${orderInfo.AddressInfo.DOORPLATE ?
orderInfo.AddressInfo.DOORPLATE : ""}`
}}</span>
</p>
<p class="order-info-type" v-if="orderInfo.BALANCE_PAYMENT">
<span class="order-info-t">工会积分支付</span><span>￥{{ orderInfo.BALANCE_PAYMENT }}</span>
</p>
<p class="order-info-type" v-if="orderInfo.TOTAL_PAY">
<span class="order-info-t">微信支付</span><span>￥{{ orderInfo.TOTAL_PAY }}</span>
<span class="order-info-t">{{ orderInfo.CHANNEL_TYPE || "" }}</span><span>￥{{ orderInfo.TOTAL_PAY
}}</span>
</p>
<p class="order-info-type">
<span class="order-info-t">订单备注</span><span>{{ orderInfo.SALEBILL_DESC }}</span>
@ -452,7 +460,7 @@ export default {
description: "彩云驿出行", //商品描述
out_trade_no: out_trade_no, // 商户订单号
notify_url:
"https://mp.eshangtech.com/Coop.Merchant/Handler/Handler_Trade.ashx", // 商户回调地址
"https://eshangtech.com:18998/Coop.Merchant/Handler/Handler_Trade.ashx", // 商户回调地址
amount: {
total: payMoney
? payMoney * 100
@ -583,6 +591,7 @@ export default {
action_type: "GetOrderDetail",
salebillId: _this.orderInternal,
saleBillChildId: _this.sellchildid ? _this.sellchildid : "",
showAddress: true
})
.then((res) => {
// console.log(res)

19
pages/shopMallPage/index/index.vue
View File

@ -731,12 +731,14 @@
<script>
import { mapGetters } from "vuex";
import shopTabbar from "../../../components/shopTabbar.vue";
import { useSkeletonControl } from '../../../utils/skeletonManager.js'
export default {
components: { shopTabbar },
data() {
return {
showContent: false, // 是否显示内容（控制骨架屏切换）
isFirstLoad: true, // 是否是首次进入页面
skeletonControl: null, // 骨架屏控制器
menu: {},
specialOffersList: [], // 特价优惠
weeklySpecialOffer: [], // 每周特惠
@ -806,6 +808,9 @@ export default {
}),
},
async onLoad(query) {
// 初始化骨架屏控制
this.skeletonControl = useSkeletonControl('/pages/shopMallPage/index/index', query.pageType || '')
console.log("query", query);
console.log("user", this.user);
this.menu = uni.getMenuButtonBoundingClientRect();
@ -882,6 +887,20 @@ export default {
}
// uni.hideLoading()
}
if (this.skeletonControl && this.skeletonControl.showSkeleton) {
setTimeout(async () => {
if (this.skeletonControl) {
await this.skeletonControl.showContentAfterLoading(0)
this.showContent = true;
this.isFirstLoad = false;
}
}, 800);
} else {
// 非首次访问直接显示内容
this.showContent = true;
this.isFirstLoad = false;
}
},
onShow() {
// 只在首次进入时显示骨架屏

2
pages/shopMallPage/user/newIndex.vue
View File

@ -920,7 +920,7 @@ export default {
let _this = this;
_this.showErrorText = 1
uni.uploadFile({
url: "https://api.eshangtech.com/EShangApiMain/Picture/UploadPicture", // 你的接口 URL
url: "https://eshangtech.com:18900/EShangApiMain/Picture/UploadPicture", // 你的接口 URL
filePath: e.detail.avatarUrl,
name: "file", // 表单中的文件字段名
formData: {

2
pages/shopPages/settlement/index.vue
View File

@ -904,7 +904,7 @@ export default {
description: "彩云驿出行", //商品描述
out_trade_no: out_trade_no, // 商户订单号
notify_url:
"https://mp.eshangtech.com/Coop.Merchant/Handler/Handler_Trade.ashx", // 商户回调地址
"https://eshangtech.com:18998/Coop.Merchant/Handler/Handler_Trade.ashx", // 商户回调地址
amount: {
// total: payMoney ? payMoney * 100 : Number(obj.PAY_AMOUNT) * 100 || 1,
total: payMoney

2
pages/shopPages/settlementFood/index.vue
View File

@ -701,7 +701,7 @@ export default {
description: "彩云驿出行", //商品描述
out_trade_no: out_trade_no, // 商户订单号
notify_url:
"https://mp.eshangtech.com/Coop.Merchant/Handler/Handler_Trade.ashx", // 商户回调地址
"https://eshangtech.com:18998/Coop.Merchant/Handler/Handler_Trade.ashx", // 商户回调地址
amount: {
total: Number(_this.orderAmount) * 100 || 1,
currency: "CNY",

2
pages/useConfig/userConfig.vue
View File

@ -385,7 +385,7 @@ export default {
async onChooseAvatar(e) {
let _this = this;
uni.uploadFile({
url: "https://api.eshangtech.com/EShangApiMain/Picture/UploadPicture", // 你的接口 URL
url: "https://eshangtech.com:18900/EShangApiMain/Picture/UploadPicture", // 你的接口 URL
filePath: e.detail.avatarUrl,
name: "file", // 表单中的文件字段名
formData: {

2
pages/useConfig/userInfo.vue
View File

@ -220,7 +220,7 @@ export default {
async onChooseAvatar(e) {
let _this = this;
uni.uploadFile({
url: "https://api.eshangtech.com/EShangApiMain/Picture/UploadPicture", // 你的接口 URL
url: "https://eshangtech.com:18900/EShangApiMain/Picture/UploadPicture", // 你的接口 URL
filePath: e.detail.avatarUrl,
name: "file", // 表单中的文件字段名
formData: {

2
pages/user/index.vue
View File

@ -999,7 +999,7 @@ export default {
let _this = this;
_this.showErrorText = 1
uni.uploadFile({
url: "https://api.eshangtech.com/EShangApiMain/Picture/UploadPicture", // 你的接口 URL
url: "https://eshangtech.com:18900/EShangApiMain/Picture/UploadPicture", // 你的接口 URL
filePath: e.detail.avatarUrl,
name: "file", // 表单中的文件字段名
formData: {

2
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/card.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/currentService.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/keyboard.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/noData.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/shopTabbar.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/tabbar.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/allFunPage/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/bindCar/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/evaluateList/addEvaluate.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/evaluateList/components/orderItem.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/evaluateList/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/highwayHeadlines/detail.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/highwayHeadlines/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myAddress/address/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myAddress/newAdd/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/newEvaluate/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/newMap/index/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/noDataPage/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/buyOrder/components/orderItem.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/buyOrder/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/foodOrder/components/orderItem.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/foodOrder/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/orderFoodDetail/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/orderdetail/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/otherFunPage/finance/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/otherFunPage/goPublicPage/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/otherFunPage/insurance/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/payfor/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/register/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/reservationOrder/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/serviceDetail/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/serviceList/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopMallPage/index/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopMallPage/shopCar/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopMallPage/shopType/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/settlement/components/commodityItem.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/settlement/components/loading/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/settlement/components/orderInfo.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/settlement/components/orderStatus.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/settlement/components/receiveGoods.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/settlement/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/settlementFood/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/shop/components/merchantEvaluation.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/shop/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/shopDetail/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopPages/shopList/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/storeDetail/components/merchantEvaluation.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/storeDetail/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/user/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/l-dragSort/components/l-dragSort/l-dragSort.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-rate/components/uni-rate/uni-rate.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/mp-weixin/common/main.js vendored
View File

@ -136,7 +136,7 @@ var _default = {
this.globalData.appLaunchTime = Date.now();
console.log('应用启动时间:', this.globalData.appLaunchTime);
this.setVisitChannels(options.scene);
this.handleGetUserInfo();
// this.handleGetUserInfo();
var _this = this;
uni.getSystemInfo({
success: function success(res) {

12
unpackage/dist/dev/mp-weixin/common/vendor.js vendored
View File

@ -12912,17 +12912,20 @@ var _handleAes = __webpack_require__(/*! ./handleAes.js */ 47);
var url = 'https://gsyw.eshangtech.com/MobileServicePlatform/Handler/handler_ajax.ashx'; // 移动业务请求路由
var coopUrl = 'https://mp.eshangtech.com/Coop.Merchant/Handler/handler_ajax.ashx'; // 合作商户请求路由
var coopUrl = 'https://eshangtech.com:18998/Coop.Merchant/Handler/handler_ajax.ashx'; // 合作商户请求路由
var mpUrl = 'https://eshangtech.com/Coop.Merchant/Handler/handler_ajax.ashx'; // 合作商户请求路由
var webUrl = 'https://api.eshangtech.com'; // webapi
var webUrl = 'https://eshangtech.com:18900'; // webapi
// let webUrl = 'http://192.168.10.125:8900/' // webapi
var staticImagePath = 'https://eshangtech.com/ShopICO';
// let nodeUrl = 'https://es.robot-z.cn'
var nodeUrl = 'https://es.eshangtech.com';
var javaUrl = "https://admin.es.eshangtech.com/platform";
var zzyLocal = "https://api.eshangtech.com/MemberApi";
// let javaUrl = `http://111.229.213.193:18075`
// let javaUrl = `https://java.es.eshangtech.com:443`
var zzyLocal = "https://eshangtech.com:18900/MemberApi";
// let javaUrl = `http://10.104.1.175:8070/platform`
var type = uni.getSystemInfoSync();
@ -15390,7 +15393,9 @@ var SkeletonManager = /*#__PURE__*/function () {
value: function markPageVisited(pagePath) {
var pageType = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
var pageKey = this.generatePageKey(pagePath, pageType);
console.log('pageKeypageKeypageKey', pageKey);
this.visitedPages.add(pageKey);
console.log('this.visitedPagesthis.visitedPages', this.visitedPages);
this.saveToCache();
console.log("\u9AA8\u67B6\u5C4F\u6807\u8BB0\u5DF2\u8BBF\u95EE: ".concat(pageKey), "\u5F53\u524D\u5DF2\u8BBF\u95EE\u9875\u9762:", Array.from(this.visitedPages));
}
@ -15431,6 +15436,7 @@ var SkeletonManager = /*#__PURE__*/function () {
var _this = this;
var pageType = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
var shouldShow = this.shouldShowSkeleton(pagePath, pageType);
console.log('1111', shouldShow);
return {
// 是否显示骨架屏
showSkeleton: shouldShow,

4
unpackage/dist/dev/mp-weixin/components/shopTabbar.json vendored
View File

@ -1,4 +1,4 @@
{
"usingComponents": {},
"component": true
"component": true,
"usingComponents": {}
}

4
unpackage/dist/dev/mp-weixin/pages/evaluateList/addEvaluate.js vendored
View File

@ -261,7 +261,7 @@ var _default = {
});
uni.uploadFile({
url: "https://mp.eshangtech.com/Coop.Merchant/Handler/handler_ajax.ashx?action_type=UploadFile&folder=Comment",
url: "https://eshangtech.com:18998/Coop.Merchant/Handler/handler_ajax.ashx?action_type=UploadFile&folder=Comment",
filePath: rs.tempFiles[0].tempFilePath,
fileType: "image",
name: "data",
@ -291,7 +291,7 @@ var _default = {
});
uni.uploadFile({
url: "https://mp.eshangtech.com/Coop.Merchant/Handler/handler_ajax.ashx?action_type=UploadFile&folder=Comment",
url: "https://eshangtech.com:18998/Coop.Merchant/Handler/handler_ajax.ashx?action_type=UploadFile&folder=Comment",
filePath: rs.tempFiles[0].tempFilePath,
fileType: "image",
name: "data",

54
unpackage/dist/dev/mp-weixin/pages/index/index.js vendored
View File

@ -1837,7 +1837,7 @@ var _default = {
handleGetHighwayHeadlines: function handleGetHighwayHeadlines() {
var _this18 = this;
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee11() {
var start, end, params, time, req, signText, sign, tweetsData, newReq, newData, list;
var start, end, params, time, req, signText, sign, newReq, newData, list;
return _regenerator.default.wrap(function _callee11$(_context11) {
while (1) {
switch (_context11.prev = _context11.next) {
@ -1883,32 +1883,30 @@ var _default = {
req.sign = sign;
// 推文数据
_context11.next = 12;
return new Promise(function (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: function 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);
// 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([]);
// resolve([])
// }
}
});
});
case 12:
tweetsData = _context11.sent;
// // let data = res.data.CollectionObject;
// // if (data && data.length > 0) {
// // resolve(data);
// // } else {
// // resolve([]);
// // }
// },
// });
// });
// if (tweetsData && tweetsData.length > 0) {
// this.roadStatusList = tweetsData;
// } else {
@ -1924,9 +1922,9 @@ var _default = {
PageSize: 10,
appId: "wxee018fb96955552a"
};
_context11.next = 16;
_context11.next = 13;
return _this18.$api.$post("/EShangApiMain/Notice/GetNOTICEINFOList", newReq);
case 16:
case 13:
newData = _context11.sent;
list = newData.Result_Data.List; // if (list && list.length > 0) {
// } else {
@ -1938,7 +1936,7 @@ var _default = {
// this.roadStatusList.unshift({
// NOTICEINFO_TITLE: "最新放假通知：调休2天，免费8天！",
// });
case 19:
case 16:
case "end":
return _context11.stop();
}

4
unpackage/dist/dev/mp-weixin/pages/newEvaluate/index.js vendored
View File

@ -256,7 +256,7 @@ var _default = {
});
uni.uploadFile({
url: "https://user.eshangtech.com/Coop.Merchant/Handler/handler_ajax.ashx?action_type=UploadFile&folder=Comment",
url: "https://eshangtech.com:18999/Coop.Merchant/Handler/handler_ajax.ashx?action_type=UploadFile&folder=Comment",
filePath: res.tempFilePath,
fileType: "image",
name: "data",
@ -285,7 +285,7 @@ var _default = {
});
uni.uploadFile({
url: "https://user.eshangtech.com/Coop.Merchant/Handler/handler_ajax.ashx?action_type=UploadFile&folder=Comment",
url: "https://eshangtech.com:18999/Coop.Merchant/Handler/handler_ajax.ashx?action_type=UploadFile&folder=Comment",
filePath: rs.tempFilePaths[0],
fileType: "image",
name: "data",

2
unpackage/dist/dev/mp-weixin/pages/order/orderFoodDetail/index.js vendored
View File

@ -394,7 +394,7 @@ var _default = {
//商品描述
out_trade_no: out_trade_no,
// 商户订单号
notify_url: "https://mp.eshangtech.com/Coop.Merchant/Handler/Handler_Trade.ashx",
notify_url: "https://eshangtech.com:18998/Coop.Merchant/Handler/Handler_Trade.ashx",
// 商户回调地址
amount: {
total: payMoney ? payMoney * 100 : Number(_this.tatalMoney) * 100 || 1,

5
unpackage/dist/dev/mp-weixin/pages/order/orderdetail/index.js vendored
View File

@ -481,7 +481,7 @@ var _default = {
//商品描述
out_trade_no: out_trade_no,
// 商户订单号
notify_url: "https://mp.eshangtech.com/Coop.Merchant/Handler/Handler_Trade.ashx",
notify_url: "https://eshangtech.com:18998/Coop.Merchant/Handler/Handler_Trade.ashx",
// 商户回调地址
amount: {
total: payMoney ? payMoney * 100 : Number(_this.tatalMoney) * 100 || 1,
@ -611,7 +611,8 @@ var _default = {
_this.$api.getCoop({
action_type: "GetOrderDetail",
salebillId: _this.orderInternal,
saleBillChildId: _this.sellchildid ? _this.sellchildid : ""
saleBillChildId: _this.sellchildid ? _this.sellchildid : "",
showAddress: true
}).then(function (res) {
// console.log(res)
if (res.ResultCode === "100") {

2
unpackage/dist/dev/mp-weixin/pages/order/orderdetail/index.wxml vendored
View File

File diff suppressed because one or more lines are too long

229
unpackage/dist/dev/mp-weixin/pages/shopMallPage/index/index.js vendored
View File

@ -413,6 +413,7 @@ var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime
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);
var _skeletonManager = __webpack_require__(/*! ../../../utils/skeletonManager.js */ 61);
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; }
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
var shopTabbar = function shopTabbar() {
@ -430,6 +431,8 @@ var _default = {
// 是否显示内容（控制骨架屏切换）
isFirstLoad: true,
// 是否是首次进入页面
skeletonControl: null,
// 骨架屏控制器
menu: {},
specialOffersList: [],
// 特价优惠
@ -554,12 +557,14 @@ var _default = {
})),
onLoad: function onLoad(query) {
var _this2 = this;
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
var firstEntry, safeHeight, data, typeList, resList, indexOfList;
return _regenerator.default.wrap(function _callee$(_context) {
return _regenerator.default.wrap(function _callee2$(_context2) {
while (1) {
switch (_context.prev = _context.next) {
switch (_context2.prev = _context2.next) {
case 0:
// 初始化骨架屏控制
_this2.skeletonControl = (0, _skeletonManager.useSkeletonControl)('/pages/shopMallPage/index/index', query.pageType || '');
console.log("query", query);
console.log("user", _this2.user);
_this2.menu = uni.getMenuButtonBoundingClientRect();
@ -588,16 +593,16 @@ var _default = {
// this.globalData.recommendCode = 1111;
// this.globalData.recommendId = 2222;
if (!(query.pageType === "UnionMall")) {
_context.next = 24;
_context2.next = 25;
break;
}
_context.next = 12;
_context2.next = 13;
return _this2.$api.$javaGet('/third-party/getWeChatGetMallGoodsType', {
ownerUnitId: 911,
commodityNature: 5070
});
case 12:
data = _context.sent;
case 13:
data = _context2.sent;
console.log("handleGetShopBigType", data);
typeList = data.Data.List || [];
resList = [];
@ -615,18 +620,18 @@ var _default = {
_this2.handleGetSortList();
// 拿到工会之家的商品列表
_this2.handleGetUnionShopList();
_context.next = 31;
_context2.next = 32;
break;
case 24:
case 25:
// uni.showLoading({
// title: "加载中"
// })
// 拿到每周优惠的内容
_this2.handleGetEveryWeekShop();
// 拿到顶部商品大类的方法
_context.next = 27;
_context2.next = 28;
return _this2.handleGetShopBigType();
case 27:
case 28:
// 拿到特价优惠的
_this2.handleGetSpecialOffers();
// 拿到今日推荐的商品列表
@ -637,12 +642,40 @@ var _default = {
_this2.handleGetActivityList();
}
// uni.hideLoading()
case 31:
case 32:
if (_this2.skeletonControl && _this2.skeletonControl.showSkeleton) {
setTimeout( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
return _regenerator.default.wrap(function _callee$(_context) {
while (1) {
switch (_context.prev = _context.next) {
case 0:
if (!_this2.skeletonControl) {
_context.next = 5;
break;
}
_context.next = 3;
return _this2.skeletonControl.showContentAfterLoading(0);
case 3:
_this2.showContent = true;
_this2.isFirstLoad = false;
case 5:
case "end":
return _context.stop();
}
}
}, _callee);
})), 800);
} else {
// 非首次访问直接显示内容
_this2.showContent = true;
_this2.isFirstLoad = false;
}
case 33:
case "end":
return _context2.stop();
}
}
}, _callee2);
}))();
},
onShow: function onShow() {
@ -755,18 +788,18 @@ var _default = {
// 榜单的方法
handleGetSortList: function handleGetSortList() {
var _this4 = this;
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
var _this, data1, newShowList, data2, hotShopList, data3, goodShopList;
return _regenerator.default.wrap(function _callee2$(_context2) {
return _regenerator.default.wrap(function _callee3$(_context3) {
while (1) {
switch (_context2.prev = _context2.next) {
switch (_context3.prev = _context3.next) {
case 0:
// 新品榜
_this = _this4;
data1 = {};
newShowList = uni.getStorageSync("newShowList");
if (!newShowList) {
_context2.next = 8;
_context3.next = 8;
break;
}
data1 = newShowList;
@ -783,10 +816,10 @@ var _default = {
_this.handleGetSortListShowData1(data);
}
});
_context2.next = 11;
_context3.next = 11;
break;
case 8:
_context2.next = 10;
_context3.next = 10;
return _this4.$api.$javaGet('/third-party/getWeChatGetMallGoodsInfo', {
action_type: "WeChat_GetMallGoodsInfo",
ownerUnitId: 911,
@ -796,7 +829,7 @@ var _default = {
userdefinedTypeId: "1317"
});
case 10:
data1 = _context2.sent;
data1 = _context3.sent;
case 11:
_this4.handleGetSortListShowData1(data1);
@ -804,7 +837,7 @@ var _default = {
data2 = {};
hotShopList = uni.getStorageSync("hotShopList");
if (!hotShopList) {
_context2.next = 19;
_context3.next = 19;
break;
}
data2 = hotShopList;
@ -822,10 +855,10 @@ var _default = {
_this.handleGetSortListShowData2(data);
}
});
_context2.next = 22;
_context3.next = 22;
break;
case 19:
_context2.next = 21;
_context3.next = 21;
return _this4.$api.$javaGet('/third-party/getWeChatGetMallGoodsInfo', {
action_type: "WeChat_GetMallGoodsInfo",
ownerUnitId: 911,
@ -836,7 +869,7 @@ var _default = {
sortStr: "COMMODITY_EN desc"
});
case 21:
data2 = _context2.sent;
data2 = _context3.sent;
case 22:
_this4.handleGetSortListShowData2(data2);
@ -844,7 +877,7 @@ var _default = {
data3 = {};
goodShopList = uni.getStorageSync("goodShopList");
if (!goodShopList) {
_context2.next = 30;
_context3.next = 30;
break;
}
data3 = goodShopList;
@ -861,10 +894,10 @@ var _default = {
_this.handleGetSortListShowData3(data);
}
});
_context2.next = 33;
_context3.next = 33;
break;
case 30:
_context2.next = 32;
_context3.next = 32;
return _this4.$api.$javaGet('/third-party/getWeChatGetMallGoodsInfo', {
action_type: "WeChat_GetMallGoodsInfo",
ownerUnitId: 911,
@ -874,15 +907,15 @@ var _default = {
userdefinedTypeId: "1319"
});
case 32:
data3 = _context2.sent;
data3 = _context3.sent;
case 33:
_this4.handleGetSortListShowData3(data3);
case 34:
case "end":
return _context2.stop();
return _context3.stop();
}
}
}, _callee2);
}, _callee3);
}))();
},
// 显示新品榜的方法
@ -946,16 +979,16 @@ var _default = {
// 拿到工会之家的商品列表
handleGetUnionShopList: function handleGetUnionShopList() {
var _this5 = this;
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
var data, list, shopList, thisResList;
return _regenerator.default.wrap(function _callee3$(_context3) {
return _regenerator.default.wrap(function _callee4$(_context4) {
while (1) {
switch (_context3.prev = _context3.next) {
switch (_context4.prev = _context4.next) {
case 0:
uni.showLoading({
title: "加载中..."
});
_context3.next = 3;
_context4.next = 3;
return _this5.$api.getCoop({
action_type: "WeChat_GetMallGoodsInfo",
ownerUnitId: 911,
@ -983,7 +1016,7 @@ var _default = {
sortStr: "".concat(_this5.sortTypeList[_this5.sortType], " ").concat(new Date().getTime % 2 > 0 ? "" : "desc") // 排序
});
case 3:
data = _context3.sent;
data = _context4.sent;
console.log("handleGetSpecialOffers", data);
list = data.Data && data.Data.List ? data.Data.List : [];
shopList = [];
@ -1023,19 +1056,19 @@ var _default = {
uni.hideLoading();
case 15:
case "end":
return _context3.stop();
return _context4.stop();
}
}
}, _callee3);
}, _callee4);
}))();
},
// 重置价格筛选
handleReset: function handleReset() {
var _this6 = this;
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
return _regenerator.default.wrap(function _callee4$(_context4) {
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
return _regenerator.default.wrap(function _callee5$(_context5) {
while (1) {
switch (_context4.prev = _context4.next) {
switch (_context5.prev = _context5.next) {
case 0:
_this6.maxPrice = "";
_this6.minPrice = "";
@ -1047,27 +1080,27 @@ var _default = {
isOver: false
};
// 拿到工会之家的商品列表
_context4.next = 7;
_context5.next = 7;
return _this6.handleGetUnionShopList();
case 7:
_this6.$refs.priceRangeRef.close();
_this6.priceRangeRefShow = false;
case 9:
case "end":
return _context4.stop();
return _context5.stop();
}
}
}, _callee4);
}, _callee5);
}))();
},
// 价格筛选的确认
handleConfirm: function handleConfirm() {
var _this7 = this;
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6() {
var newMax, newMin;
return _regenerator.default.wrap(function _callee5$(_context5) {
return _regenerator.default.wrap(function _callee6$(_context6) {
while (1) {
switch (_context5.prev = _context5.next) {
switch (_context6.prev = _context6.next) {
case 0:
if (Number(_this7.minPrice) <= Number(_this7.maxPrice)) {} else {
if (_this7.maxPrice && _this7.minPrice) {
@ -1084,17 +1117,17 @@ var _default = {
isOver: false
};
// 拿到工会之家的商品列表
_context5.next = 5;
_context6.next = 5;
return _this7.handleGetUnionShopList();
case 5:
_this7.$refs.priceRangeRef.close();
_this7.priceRangeRefShow = false;
case 7:
case "end":
return _context5.stop();
return _context6.stop();
}
}
}, _callee5);
}, _callee6);
}))();
},
// 显示价格的悬浮框
@ -1118,17 +1151,17 @@ var _default = {
// 拿到顶部商品大类的方法
handleGetShopBigType: function handleGetShopBigType() {
var _this8 = this;
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6() {
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7() {
var _this, typeList, getWeChatGetMallGoodsType, data;
return _regenerator.default.wrap(function _callee6$(_context6) {
return _regenerator.default.wrap(function _callee7$(_context7) {
while (1) {
switch (_context6.prev = _context6.next) {
switch (_context7.prev = _context7.next) {
case 0:
_this = _this8;
typeList = [];
getWeChatGetMallGoodsType = uni.getStorageSync('getWeChatGetMallGoodsType');
if (!getWeChatGetMallGoodsType) {
_context6.next = 8;
_context7.next = 8;
break;
}
typeList = getWeChatGetMallGoodsType;
@ -1142,16 +1175,16 @@ var _default = {
_this.handleShowPageShopBigType(newTypeList);
}
});
_context6.next = 14;
_context7.next = 14;
break;
case 8:
_context6.next = 10;
_context7.next = 10;
return _this8.$api.$javaGet('/third-party/getWeChatGetMallGoodsType', {
ownerUnitId: 911,
commodityNature: 5070 // 类型
});
case 10:
data = _context6.sent;
data = _context7.sent;
console.log("handleGetShopBigType", data);
typeList = data.Data.List;
uni.setStorageSync("getWeChatGetMallGoodsType", typeList);
@ -1160,10 +1193,10 @@ var _default = {
_this8.handleShowPageShopBigType(typeList);
case 16:
case "end":
return _context6.stop();
return _context7.stop();
}
}
}, _callee6);
}, _callee7);
}))();
},
// 拿到顶部商品大类的方法 实际要赋值到页面上去的方法
@ -1194,13 +1227,13 @@ var _default = {
// 拿到活动的商品列表 可能不调用 有判断的
handleGetActivityList: function handleGetActivityList() {
var _this10 = this;
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7() {
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee8() {
var data, list, res;
return _regenerator.default.wrap(function _callee7$(_context7) {
return _regenerator.default.wrap(function _callee8$(_context8) {
while (1) {
switch (_context7.prev = _context7.next) {
switch (_context8.prev = _context8.next) {
case 0:
_context7.next = 2;
_context8.next = 2;
return _this10.$api.$javaGet('/third-party/getWeChatGetMallGoodsInfoExclude',
// url,
{
@ -1211,7 +1244,7 @@ var _default = {
justCommodity: 1
});
case 2:
data = _context7.sent;
data = _context8.sent;
console.log("handleGetActivityList", data);
list = data.Data.List;
res = [];
@ -1233,26 +1266,26 @@ var _default = {
_this10.activityShopList = res;
case 8:
case "end":
return _context7.stop();
return _context8.stop();
}
}
}, _callee7);
}, _callee8);
}))();
},
// 拿到特价优惠的商品列表 nature 5030
handleGetSpecialOffers: function handleGetSpecialOffers() {
var _this11 = this;
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee8() {
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee9() {
var _this, list, getWeChatGetMallGoodsInfoExclude, url, _url, data;
return _regenerator.default.wrap(function _callee8$(_context8) {
return _regenerator.default.wrap(function _callee9$(_context9) {
while (1) {
switch (_context8.prev = _context8.next) {
switch (_context9.prev = _context9.next) {
case 0:
_this = _this11;
list = [];
getWeChatGetMallGoodsInfoExclude = uni.getStorageSync("getWeChatGetMallGoodsInfoExclude");
if (!getWeChatGetMallGoodsInfoExclude) {
_context8.next = 9;
_context9.next = 9;
break;
}
list = getWeChatGetMallGoodsInfoExclude;
@ -1275,11 +1308,11 @@ var _default = {
_this.handleGetSpecialOffersShowData(newList);
}
});
_context8.next = 14;
_context9.next = 14;
break;
case 9:
_url = _this11.pageType === "UnionMall" ? '/third-party/getWeChatGetMallGoodsInfo' : '/third-party/getWeChatGetMallGoodsInfoExclude';
_context8.next = 12;
_context9.next = 12;
return _this11.$api.$javaGet(
// '/third-party/getExcludeWeChatGetMallGoodsInfo',
_url, {
@ -1295,16 +1328,16 @@ var _default = {
justCommodity: 1
});
case 12:
data = _context8.sent;
data = _context9.sent;
list = data.Data && data.Data.List ? data.Data.List : [];
case 14:
_this11.handleGetSpecialOffersShowData(list);
case 15:
case "end":
return _context8.stop();
return _context9.stop();
}
}
}, _callee8);
}, _callee9);
}))();
},
// 拿到特价优惠的商品列表显示内容的方法
@ -1341,17 +1374,17 @@ var _default = {
// 拿到每周特惠的商品列表
handleGetEveryWeekShop: function handleGetEveryWeekShop() {
var _this12 = this;
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee9() {
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee10() {
var _this, list, getWeChatGetMallGoodsInfo, data;
return _regenerator.default.wrap(function _callee9$(_context9) {
return _regenerator.default.wrap(function _callee10$(_context10) {
while (1) {
switch (_context9.prev = _context9.next) {
switch (_context10.prev = _context10.next) {
case 0:
_this = _this12;
list = [];
getWeChatGetMallGoodsInfo = uni.getStorageSync("getWeChatGetMallGoodsInfo");
if (!getWeChatGetMallGoodsInfo) {
_context9.next = 8;
_context10.next = 8;
break;
}
list = getWeChatGetMallGoodsInfo;
@ -1367,10 +1400,10 @@ var _default = {
_this.handleGetEveryWeekShopShowData(newList);
}
});
_context9.next = 13;
_context10.next = 13;
break;
case 8:
_context9.next = 10;
_context10.next = 10;
return _this12.$api.$javaGet('/third-party/getWeChatGetMallGoodsInfo', {
ownerUnitId: 911,
userdefinedtypeId: 4597,
@ -1378,17 +1411,17 @@ var _default = {
justCommodity: 1
});
case 10:
data = _context9.sent;
data = _context10.sent;
list = data.Data && data.Data.List ? data.Data.List : [];
uni.setStorageSync("getWeChatGetMallGoodsInfo", list);
case 13:
_this12.handleGetEveryWeekShopShowData(list);
case 14:
case "end":
return _context9.stop();
return _context10.stop();
}
}
}, _callee9);
}, _callee10);
}))();
},
// 每周商品特惠显示数据的方法
@ -1421,17 +1454,17 @@ var _default = {
// 拿到今日推荐的商品列表 nature 5050
handleGetTodayOffers: function handleGetTodayOffers() {
var _this13 = this;
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee10() {
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee11() {
var _this, getWeChatGetMallGoodsInfoExcludeToday, list, data;
return _regenerator.default.wrap(function _callee10$(_context10) {
return _regenerator.default.wrap(function _callee11$(_context11) {
while (1) {
switch (_context10.prev = _context10.next) {
switch (_context11.prev = _context11.next) {
case 0:
_this = _this13;
getWeChatGetMallGoodsInfoExcludeToday = uni.getStorageSync("getWeChatGetMallGoodsInfoExcludeToday");
list = [];
if (!getWeChatGetMallGoodsInfoExcludeToday) {
_context10.next = 8;
_context11.next = 8;
break;
}
list = getWeChatGetMallGoodsInfoExcludeToday;
@ -1453,10 +1486,10 @@ var _default = {
_this.handleGetTodayOffersShowData(newList);
}
});
_context10.next = 12;
_context11.next = 12;
break;
case 8:
_context10.next = 10;
_context11.next = 10;
return _this13.$api.$javaGet('/third-party/getWeChatGetMallGoodsInfoExclude', {
ownerUnitId: 911,
// COMMODITYNATURE: 4598,// 原今日推荐
@ -1470,16 +1503,16 @@ var _default = {
justCommodity: 1
});
case 10:
data = _context10.sent;
data = _context11.sent;
list = data.Data.List;
case 12:
_this13.handleGetTodayOffersShowData(list);
case 13:
case "end":
return _context10.stop();
return _context11.stop();
}
}
}, _callee10);
}, _callee11);
}))();
},
// 拿到今日推荐的商品列表显示数据的方法
@ -1535,16 +1568,16 @@ var _default = {
// 拿到甄选商品 3000
handleGetProductsList: function handleGetProductsList() {
var _this14 = this;
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee11() {
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee12() {
var data, list, resList, thisResList;
return _regenerator.default.wrap(function _callee11$(_context11) {
return _regenerator.default.wrap(function _callee12$(_context12) {
while (1) {
switch (_context11.prev = _context11.next) {
switch (_context12.prev = _context12.next) {
case 0:
uni.showLoading({
title: "加载中"
});
_context11.next = 3;
_context12.next = 3;
return _this14.$api.$javaGet('/third-party/getWeChatGetMallGoodsInfo', {
ownerUnitId: 911,
justCommodity: 1,
@ -1552,7 +1585,7 @@ var _default = {
COMMODITYNATURE: 6000
});
case 3:
data = _context11.sent;
data = _context12.sent;
list = data.Data.List;
console.log('积分商城', list);
resList = [];
@ -1602,10 +1635,10 @@ var _default = {
// }
case 14:
case "end":
return _context11.stop();
return _context12.stop();
}
}
}, _callee11);
}, _callee12);
}))();
},
// 返回首页

2
unpackage/dist/dev/mp-weixin/pages/shopPages/settlement/index.js vendored
View File

@ -1043,7 +1043,7 @@ var _default = {
//商品描述
out_trade_no: out_trade_no,
// 商户订单号
notify_url: "https://mp.eshangtech.com/Coop.Merchant/Handler/Handler_Trade.ashx",
notify_url: "https://eshangtech.com:18998/Coop.Merchant/Handler/Handler_Trade.ashx",
// 商户回调地址
amount: {
// total: payMoney ? payMoney * 100 : Number(obj.PAY_AMOUNT) * 100 || 1,

2
unpackage/dist/dev/mp-weixin/pages/shopPages/settlementFood/index.js vendored
View File

@ -637,7 +637,7 @@ var _default = {
//商品描述
out_trade_no: out_trade_no,
// 商户订单号
notify_url: "https://mp.eshangtech.com/Coop.Merchant/Handler/Handler_Trade.ashx",
notify_url: "https://eshangtech.com:18998/Coop.Merchant/Handler/Handler_Trade.ashx",
// 商户回调地址
amount: {
total: Number(_this.orderAmount) * 100 || 1,

2
unpackage/dist/dev/mp-weixin/pages/user/index.js vendored
View File

@ -962,7 +962,7 @@ var _default = {
_this = _this7;
_this.showErrorText = 1;
uni.uploadFile({
url: "https://api.eshangtech.com/EShangApiMain/Picture/UploadPicture",
url: "https://eshangtech.com:18900/EShangApiMain/Picture/UploadPicture",
// 你的接口 URL
filePath: e.detail.avatarUrl,
name: "file",

8
utils/api.js
View File

@ -4,10 +4,10 @@ import { encryptAES } from './handleAes.js'
let url = 'https://gsyw.eshangtech.com/MobileServicePlatform/Handler/handler_ajax.ashx' // 移动业务请求路由
let coopUrl = 'https://mp.eshangtech.com/Coop.Merchant/Handler/handler_ajax.ashx' // 合作商户请求路由
let coopUrl = 'https://eshangtech.com:18998/Coop.Merchant/Handler/handler_ajax.ashx' // 合作商户请求路由
let mpUrl = 'https://eshangtech.com/Coop.Merchant/Handler/handler_ajax.ashx' // 合作商户请求路由
let webUrl = 'https://api.eshangtech.com' // webapi
let webUrl = 'https://eshangtech.com:18900' // webapi
// let webUrl = 'http://192.168.10.125:8900/' // webapi
let staticImagePath = 'https://eshangtech.com/ShopICO'
@ -15,8 +15,10 @@ let staticImagePath = 'https://eshangtech.com/ShopICO'
let nodeUrl = 'https://es.eshangtech.com'
let javaUrl = `https://admin.es.eshangtech.com/platform`
// let javaUrl = `http://111.229.213.193:18075`
// let javaUrl = `https://java.es.eshangtech.com:443`
let zzyLocal = `https://api.eshangtech.com/MemberApi`
let zzyLocal = `https://eshangtech.com:18900/MemberApi`
// let javaUrl = `http://10.104.1.175:8070/platform`
let type = uni.getSystemInfoSync();

5
utils/skeletonManager.js
View File

@ -78,7 +78,10 @@ class SkeletonManager {
*/
markPageVisited(pagePath, pageType = '') {
const pageKey = this.generatePageKey(pagePath, pageType)
console.log('pageKeypageKeypageKey', pageKey);
this.visitedPages.add(pageKey)
console.log('this.visitedPagesthis.visitedPages', this.visitedPages);
this.saveToCache()
console.log(`骨架屏标记已访问: ${pageKey}`, `当前已访问页面:`, Array.from(this.visitedPages))
}
@ -110,7 +113,9 @@ class SkeletonManager {
* @returns {object} 控制状态对象
*/
getPageSkeletonControl(pagePath, pageType = '') {
const shouldShow = this.shouldShowSkeleton(pagePath, pageType)
console.log('1111', shouldShow);
return {
// 是否显示骨架屏