XiaoMo/JMApp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
小陌 2024-03-20 18:16:30 +08:00
parent 6fe05463fa
commit edc6a1df50
8 changed files with 106 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pages/index/index.js
View File

@ -11,7 +11,7 @@ Page({
}, {
img: "video",
name: "洗车教程",
url: "webview/webview?url=https://jm.v0750.com/video",
url: "webview/webview?url=https://jmqf.v0750.com/video",
needlogin: !1
}, {
img: "xichequan",
@ -121,8 +121,8 @@ Page({
success: function(i) {
console.log(i), wx.showLoading({
title: ""
}), e.globalData.qrcode = i.result, t.request("https://jm.v0750.com/miniprogram/identify", i, !0).then(function(t) {
console.log("data", t), wx.hideLoading(), e.globalData.devicecode = t.data.devicecode || e.globalData.devicecode,
}), e.globalData.qrcode = i.result, t.request("https://jmqf.v0750.com/miniprogram/identify", i, !0).then(function(t) {
console.log("data", t), wx.hideLoading(), e.globalData.devicecode = t.data.devicecode || e.globalData.devicecode,
a.setData({
isScan: !!t.data.devicecode
});
@ -193,7 +193,7 @@ Page({
wx.requestSubscribeMessage({
tmplIds: this.data.tmplIds,
success: function(e) {
console.log("requestSubscribeMessage", e), t.request("https://jm.v0750.com/miniprogram/index/newtmpl", e, !0).then(function(e) {}).catch(function(e) {});
console.log("requestSubscribeMessage", e), t.request("https://jmqf.v0750.com/miniprogram/index/newtmpl", e, !0).then(function(e) {}).catch(function(e) {});
},
fail: function(e) {
console.log("requestSubscribeMessagefail", e);

8
pages/login/login.js
View File

@ -3,7 +3,7 @@ var e = getApp(), o = require("../../utils/login.js");
Page({
data: {
logs: [],
isnotInfo: 1
isnotInfo: 2
},
fromPage: "",
onLoad: function(e) {
@ -20,7 +20,7 @@ Page({
"getUserInfo:ok" == e.detail.errMsg ? (this.setData({
isnotInfo: 2
}), this.userInfo = e.detail) : wx.redirectTo({
url: "/pages/register/register"
url: "/pages/login/login"
});
},
userInfo: {},
@ -29,7 +29,7 @@ Page({
code: a
});
o.request(e.globalData.config.authorization, n, !0).then(function(o) {
if (wx.hideLoading(), console.log("toAuthorization", "app.globalData.needJumpUrl", e.globalData.needJumpUrl, o),
if (wx.hideLoading(), console.log("toAuthorization", "app.globalData.needJumpUrl", e.globalData.needJumpUrl, o),
200 != o.code) return wx.showModal({
title: "提示",
content: o.message
@ -53,7 +53,7 @@ Page({
}
}), !1;
wx.redirectTo({
url: "/pages/register/register"
url: "/pages/login/login"
});
}
});

10
pages/map/map.js
View File

@ -30,7 +30,7 @@ Page({
return t.next = 2, o.getlocation();
case 2:
a = t.sent, console.log("result:", a), a && (o.latitude = a.latitude, o.longitude = a.longitude),
a = t.sent, console.log("result:", a), a && (o.latitude = a.latitude, o.longitude = a.longitude),
o.getData();
case 6:
@ -88,9 +88,9 @@ Page({
latitude: this.latitude
}).then(function(e) {
wx.hideLoading(), 200 == e.code ? (e.data.list.forEach(function(t, e) {
t.id = e, t.width = 32, t.height = 32, t.latitude = 1 * t.latitude, t.longitude = 1 * t.longitude,
t.id = e, t.width = 32, t.height = 32, t.latitude = 1 * t.latitude, t.longitude = 1 * t.longitude,
t.iconPath = "/img/location-blue.png", t.callout = {
content: t.t_name
content: t.name
};
}), t.setData({
weather: e.data.weather,
@ -114,7 +114,7 @@ Page({
t.iconPath = "/img/location-blue.png";
});
for (var e = 0; e < this.data.markers.length; e++) if (this.data.markers[e].id == t.detail.markerId) {
console.log(e), this.data.markers[e].iconPath = "/img/location-red.png", this.data.markers[e].width = 50,
console.log(e), this.data.markers[e].iconPath = "/img/location-red.png", this.data.markers[e].width = 50,
this.data.markers[e].height = 50, this.setData({
shop: Object.assign({}, this.data.markers[e]),
showshop: !0
@ -157,7 +157,7 @@ Page({
wx.openLocation({
latitude: this.data.shop.latitude,
longitude: this.data.shop.longitude,
name: this.data.shop.t_name,
name: this.data.shop.name,
address: this.data.shop.address
});
}

2
pages/map/map.wxml
View File

@ -23,7 +23,7 @@
</cover-view>
</cover-view>
<cover-view class="{{showshop?'showshop shop':'shop'}}">
<cover-view class="name">{{shop.t_name}}</cover-view>
<cover-view class="name">{{shop.name}}</cover-view>
<cover-view class="border"></cover-view>
<cover-view class="add">
<cover-view class="l">

83
pages/voucher/voucher.js
View File

@ -17,27 +17,27 @@ Page({
showTips: !1,
approve: !0
},
onLoad: function(a) {
onLoad: function (a) {
var i = this;
e.pageStart(t).then(function(e) {
e.pageStart(t).then(function (e) {
i.getList(), i.setData({
servicetel: t.globalData.servicetel
});
});
},
onShow: function(e) {
onShow: function (e) {
t.globalData.isneedUpload && (this.getList(), t.globalData.isneedUpload = !1);
},
onPullDownRefresh: function() {
onPullDownRefresh: function () {
this.setData({
list: []
}), this.getList();
},
onReachBottom: function() {
onReachBottom: function () {
this.getList();
},
onShareAppMessage: function() {},
getList: function() {
onShareAppMessage: function () { },
getList: function () {
var a = this;
if (this.data.loading) return !1;
this.setData({
@ -46,7 +46,7 @@ Page({
title: ""
}), e.request(t.globalData.config.recharge.init, {
page: this.data.page.next_page
}, !0).then(function(t) {
}, !0).then(function (t) {
if (wx.hideLoading(), a.setData({
loading: !1
}), 200 != t.code) return wx.showModal({
@ -59,47 +59,60 @@ Page({
user: t.data.user,
protocol: t.data.protocol,
tips: t.data.tips.split("\n")
}, function() {});
}).catch(function(t) {
}, function () { });
}).catch(function (t) {
wx.hideLoading();
});
},
tobuy: function(a) {
tobuy: function (a) {
var i = a.currentTarget.dataset.id;
console.log(i), wx.showLoading({
wx.showLoading({
title: ""
}), e.request(t.globalData.config.recharge.create, {
id: i
}, !0).then(function(t) {
}, !0).then(function (t) {
if (wx.hideLoading(), 200 != t.code) return wx.showModal({
title: "提示",
content: t.message
}), !1;
var e = t.data.result;
console.log('tobuy', e, t);
wx.requestPayment({
timeStamp: e.timestamp,
timeStamp: e.timeStamp,
nonceStr: e.nonceStr,
package: e.package,
signType: e.signType,
paySign: e.paySign,
success: function(t) {
success: function (t) {
// 加载回调接口
e.request(t.data.notify_url, {
orderid: t.data.orderid
}, !0).then(function (t) {
console.log('pay_success', t);
}).catch(function (t) {
console.log('pay_success', t);
});
getCurrentPages().length > 1 ? wx.navigateBack({}) : wx.redirectTo({
url: "/pages/index/index"
});
}
});
}).catch(function(t) {
}).catch(function (t) {
wx.hideLoading();
});
},
selectItem: function(t) {
selectItem: function (t) {
var e = t.currentTarget.dataset.id;
this.setData({
selectItemID: e
});
},
isSubmit: !1,
tobuyNow: function(a) {
tobuyNow: function (a) {
if (!this.data.approve) return wx.showToast({
title: "请勾选同意相关条款",
icon: "none"
@ -114,34 +127,46 @@ Page({
var i = this;
e.request(t.globalData.config.recharge.create, {
id: i.data.selectItemID
}, !0).then(function(t) {
}, !0).then(function (t) {
if (wx.hideLoading(), i.isSubmit = !1, 200 != t.code) return wx.showModal({
title: "提示",
content: t.message
}), !1;
var e = t.data.result;
var r = t.data.result;
wx.requestPayment({
timeStamp: e.timestamp,
nonceStr: e.nonceStr,
package: e.package,
signType: e.signType,
paySign: e.paySign,
success: function(t) {
timeStamp: r.timeStamp,
nonceStr: r.nonceStr,
package: r.package,
signType: r.signType,
paySign: r.paySign,
success: function (o) {
if (t.data.notify_url) {
// 加载回调接口
e.request(t.data.notify_url, {
orderid: t.data.orderid
}, !0).then(function (t) {
console.log('pay_success', t);
}).catch(function (t) {
console.log('pay_success', t);
});
}
getCurrentPages().length > 1 ? wx.navigateBack({}) : wx.redirectTo({
url: "/pages/index/index"
});
}
});
}).catch(function(t) {
}).catch(function (t) {
wx.hideLoading(), i.isSubmit = !1;
});
},
showprovision: function() {
showprovision: function () {
this.setData({
showTips: !this.data.showTips
});
},
change: function(t) {
change: function (t) {
var e = t.detail.value.length;
this.setData({
approve: 1 == e

4
pages/washCodeList/washCodeList.js
View File

@ -13,7 +13,7 @@ Page({
onLoad: function(a) {
var i = this;
e.pageStart(t).then(function(e) {
i.getList(), console.log("app.globalData.devicecode", t.globalData.user.money, t.globalData.devicecode),
i.getList(), console.log("app.globalData.devicecode", t.globalData.user.money, t.globalData.devicecode),
i.setData({
isScan: !!t.globalData.devicecode
});
@ -77,7 +77,7 @@ Page({
success: function(i) {
wx.showLoading({
title: ""
}), t.globalData.qrcode = i.result, e.request("https://jm.v0750.com/miniprogram/identify", i, !0).then(function(e) {
}), t.globalData.qrcode = i.result, e.request("https://jmqf.v0750.com/miniprogram/identify", i, !0).then(function(e) {
if (wx.hideLoading(), 200 != e.code) return wx.showModal({
title: "提示",
content: e.message

58
project.config.json
View File

@ -1,30 +1,30 @@
{
"appid": "wxc7845752d17217d1",
"compileType": "miniprogram",
"libVersion": "3.3.4",
"packOptions": {
"ignore": [],
"include": []
},
"setting": {
"coverView": true,
"es6": false,
"postcss": true,
"minified": true,
"enhance": false,
"ignoreDevUnusedFiles": false,
"ignoreUploadUnusedFiles": false,
"showShadowRootInWxmlPanel": true,
"packNpmRelationList": [],
"babelSetting": {
"ignore": [],
"disablePlugins": [],
"outputPath": ""
}
},
"condition": {},
"editorSetting": {
"tabIndent": "insertSpaces",
"tabSize": 2
}
{
"appid": "wxc7845752d17217d1",
"compileType": "miniprogram",
"libVersion": "3.3.4",
"packOptions": {
"ignore": [],
"include": []
},
"setting": {
"coverView": true,
"es6": false,
"postcss": true,
"minified": true,
"enhance": false,
"ignoreDevUnusedFiles": false,
"ignoreUploadUnusedFiles": false,
"showShadowRootInWxmlPanel": true,
"packNpmRelationList": [],
"babelSetting": {
"ignore": [],
"disablePlugins": [],
"outputPath": ""
}
},
"condition": {},
"editorSetting": {
"tabIndent": "insertSpaces",
"tabSize": 2
}
}

14
utils/login.js
View File

@ -1,4 +1,4 @@
var e = require("../@babel/runtime/helpers/typeof"), o = (require("./common.js"),
var e = require("../@babel/runtime/helpers/typeof"), o = (require("./common.js"),
null), a = null;
function t() {
@ -78,18 +78,18 @@ function n(a) {
}
function c(e, a) {
console.log("appstart", e), o = a, n("https://jm.v0750.com/miniprogram", {
console.log("appstart", e), o = a, n("https://jmqf.v0750.com/miniprogram", {
code: e
}, !0).then(function(e) {
var o = e.data;
console.log("总接口", o), a.globalData.user = o.user, wx.setStorageSync("session", o.user.session),
a.globalData.isUserAuthorization = o.user > 0 ? 2 : 1, a.globalData.config = o.config,
console.log("总接口", o), a.globalData.user = o.user, wx.setStorageSync("session", o.user.session),
a.globalData.isUserAuthorization = o.user > 0 ? 2 : 1, a.globalData.config = o.config,
a.globalData.servicetel = o.servicetel, a.globalData.canGetData = !0, a.globalData.protocol = o.protocol;
});
}
module.exports = {
initial_url: "https://jm.v0750.com/miniprogram",
initial_url: "https://jmqf.v0750.com/miniprogram",
login: t,
request: n,
pageStart: function(e) {
@ -106,9 +106,9 @@ module.exports = {
c(res.code, e);
});
},
baseUrl: "https://jm.v0750.com/",
baseUrl: "https://jmqf.v0750.com/",
getDevicecode: function(e, a) {
o = e, n("https://jm.v0750.com/miniprogram/identify/reload", a, !0).then(function(e) {
o = e, n("https://jmqf.v0750.com/miniprogram/identify/reload", a, !0).then(function(e) {
var a = e.data;
console.log("onshow获取到的数据", a), o.globalData.devicecode = a.devicecode || o.globalData.devicecode;
});