Merge branch 'main' of http://47.109.71.130:3000/attiya/ebike-ui
This commit is contained in:
commit
e560aff43d
81
ebike-user/package-lock.json
generated
81
ebike-user/package-lock.json
generated
@ -10,7 +10,6 @@
|
||||
"dayjs": "^1.11.13",
|
||||
"lodash": "^4.17.21",
|
||||
"qqmap-wx-jssdk": "^1.0.0",
|
||||
"require": "^2.4.20",
|
||||
"sm-crypto": "^0.3.13",
|
||||
"uni-ui": "^1.0.0"
|
||||
}
|
||||
@ -19,19 +18,6 @@
|
||||
"version": "1.5.7",
|
||||
"integrity": "sha512-DugxSIrQrze1FLdUOj9a+JEQ0bHGjnJTcGUK1mN/MivKg7nuKJBRWk5Ipa9sUdoBznX6ndz5h2e7Uao6x1CdCw=="
|
||||
},
|
||||
"node_modules/amdefine": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmmirror.com/amdefine/-/amdefine-1.0.1.tgz",
|
||||
"integrity": "sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg==",
|
||||
"engines": {
|
||||
"node": ">=0.4.2"
|
||||
}
|
||||
},
|
||||
"node_modules/async": {
|
||||
"version": "0.2.10",
|
||||
"resolved": "https://registry.npmmirror.com/async/-/async-0.2.10.tgz",
|
||||
"integrity": "sha512-eAkdoKxU6/LkKDBzLpT+t6Ff5EtfSF4wx1WfJiPEEV7WNLnDaRXk0oVysiEPm262roaachGexwUv94WhSgN5TQ=="
|
||||
},
|
||||
"node_modules/crypto-js": {
|
||||
"version": "4.2.0",
|
||||
"resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz",
|
||||
@ -53,36 +39,12 @@
|
||||
"resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz",
|
||||
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
|
||||
},
|
||||
"node_modules/optimist": {
|
||||
"version": "0.3.7",
|
||||
"resolved": "https://registry.npmmirror.com/optimist/-/optimist-0.3.7.tgz",
|
||||
"integrity": "sha512-TCx0dXQzVtSCg2OgY/bO9hjM9cV4XYx09TVK+s3+FhkjT6LovsLe+pPMzpWf+6yXK/hUizs2gUoTw3jHM0VaTQ==",
|
||||
"dependencies": {
|
||||
"wordwrap": "~0.0.2"
|
||||
}
|
||||
},
|
||||
"node_modules/qqmap-wx-jssdk": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmmirror.com/qqmap-wx-jssdk/-/qqmap-wx-jssdk-1.0.0.tgz",
|
||||
"integrity": "sha512-wuaNetsA9/OKEQGgK1CNPsX6pppWpY10cQwQu1OHJplGMyMIMzK2bliMkNXjtry99qXYCsvDAWPqw2DI+/foJg==",
|
||||
"license": "ISC"
|
||||
},
|
||||
"node_modules/require": {
|
||||
"version": "2.4.20",
|
||||
"resolved": "https://registry.npmmirror.com/require/-/require-2.4.20.tgz",
|
||||
"integrity": "sha512-7eop5rvh38qhQQQOoUyf68meVIcxT2yFySNywTbxoEECgkX4KDqqDRaEszfvFnuB3fuZVjDdJZ1TI/Esr16RRA==",
|
||||
"dependencies": {
|
||||
"std": "0.1.40",
|
||||
"uglify-js": "2.3.0"
|
||||
},
|
||||
"bin": {
|
||||
"require": "bin/require-command.js"
|
||||
},
|
||||
"engines": {
|
||||
"browsers": "*",
|
||||
"node": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/sm-crypto": {
|
||||
"version": "0.3.13",
|
||||
"resolved": "https://registry.npmjs.org/sm-crypto/-/sm-crypto-0.3.13.tgz",
|
||||
@ -91,53 +53,10 @@
|
||||
"jsbn": "^1.1.0"
|
||||
}
|
||||
},
|
||||
"node_modules/source-map": {
|
||||
"version": "0.1.43",
|
||||
"resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.1.43.tgz",
|
||||
"integrity": "sha512-VtCvB9SIQhk3aF6h+N85EaqIaBFIAfZ9Cu+NJHHVvc8BbEcnvDcFw6sqQ2dQrT6SlOrZq3tIvyD9+EGq/lJryQ==",
|
||||
"dependencies": {
|
||||
"amdefine": ">=0.0.4"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=0.8.0"
|
||||
}
|
||||
},
|
||||
"node_modules/std": {
|
||||
"version": "0.1.40",
|
||||
"resolved": "https://registry.npmmirror.com/std/-/std-0.1.40.tgz",
|
||||
"integrity": "sha512-wUf57hkDGCoVShrhPA8Q7lAg2Qosk+FaMlECmAsr1A4/rL2NRXFHQGBcgMUFKVkPEemJFW9gzjCQisRty14ohg==",
|
||||
"engines": {
|
||||
"node": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/uglify-js": {
|
||||
"version": "2.3.0",
|
||||
"resolved": "https://registry.npmmirror.com/uglify-js/-/uglify-js-2.3.0.tgz",
|
||||
"integrity": "sha512-AQvbxRKdaQeYADywQaao0k8Tj+7NGEVTne6xwgX1yQpv/G8b0CKdIw70HkCptwfvNGDsVe+0Bng3U9hfWbxxfg==",
|
||||
"dependencies": {
|
||||
"async": "~0.2.6",
|
||||
"optimist": "~0.3.5",
|
||||
"source-map": "~0.1.7"
|
||||
},
|
||||
"bin": {
|
||||
"uglifyjs": "bin/uglifyjs"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=0.4.0"
|
||||
}
|
||||
},
|
||||
"node_modules/uni-ui": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/uni-ui/-/uni-ui-1.0.0.tgz",
|
||||
"integrity": "sha512-NDN1mfZhMa0FCnEt3vyqBcNUCHcz+At2+OgcPakCwm3SsXeKZ8Qk7u60CpxqVmhnk14jhgJdxgtCpwx1yW96VQ=="
|
||||
},
|
||||
"node_modules/wordwrap": {
|
||||
"version": "0.0.3",
|
||||
"resolved": "https://registry.npmmirror.com/wordwrap/-/wordwrap-0.0.3.tgz",
|
||||
"integrity": "sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw==",
|
||||
"engines": {
|
||||
"node": ">=0.4.0"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
<uni-forms-item label="车辆编号">
|
||||
<uni-easyinput :disabled="true" v-model="bikeCode" placeholder="车辆编号" />
|
||||
</uni-forms-item>
|
||||
<span @click="goToSH">去审核</span>
|
||||
<!-- <span @click="goToSH">去审核</span> -->
|
||||
</uni-forms>
|
||||
</view>
|
||||
<view class="">
|
||||
@ -300,7 +300,7 @@
|
||||
duration: 2000,
|
||||
complete: function() {
|
||||
// 在弹出提示框后再跳转到我的页面
|
||||
uni.switchTab({
|
||||
uni.navigateTo({
|
||||
url: "/pages/user/mine/MePage"
|
||||
});
|
||||
}
|
||||
@ -383,11 +383,11 @@
|
||||
ebikeInfo.value.latitude = res.location.lat;
|
||||
ebikeInfo.value.longitude = res.location.lng;
|
||||
}
|
||||
const goToSH = () => {
|
||||
uni.navigateTo({
|
||||
url: "/pages/warehouse/UserReportedFaults/UserReportedFaults"
|
||||
})
|
||||
}
|
||||
// const goToSH = () => {
|
||||
// uni.navigateTo({
|
||||
// url: "/pages/warehouse/UserReportedFaults/UserReportedFaults"
|
||||
// })
|
||||
// }
|
||||
</script>
|
||||
|
||||
<style>
|
||||
|
||||
@ -107,7 +107,7 @@
|
||||
isloading.value = true;
|
||||
setTimeout(() => {
|
||||
isloading.value = false;
|
||||
uni.switchTab({
|
||||
uni.navigateTo({
|
||||
url: "/pages/mine/mine"
|
||||
})
|
||||
}, 1000);
|
||||
|
||||
@ -64,7 +64,7 @@
|
||||
if (res.code == 200) {
|
||||
uni.clearStorage("wechat_user");
|
||||
showModelMessage("注销成功").then(()=>{
|
||||
uni.switchTab({
|
||||
uni.navigateTo({
|
||||
url: "/pages/user/home/home"
|
||||
})
|
||||
});
|
||||
|
||||
@ -57,7 +57,7 @@
|
||||
const isAgreed = ref([]); // 用来控制复选框的选中状态
|
||||
const isloading = ref(false);
|
||||
const phone = ref("");
|
||||
const openid = ref("");
|
||||
const openId = ref("");
|
||||
const agreed = ref([{
|
||||
value: true // true 表示选中
|
||||
}]);
|
||||
@ -85,12 +85,12 @@
|
||||
api.callOrdereApi("ebikeUser/login?js_code=" + res.code, {}, "get").then(
|
||||
(wx) => {
|
||||
if (wx.code == 200) {
|
||||
openId.value = wx.data;
|
||||
api.callOrdereApi("ebikeUser/getInfoByOpenId?openId=" + wx.data, {},
|
||||
"get")
|
||||
.then((info) => {
|
||||
isloading.value = false;
|
||||
if (info.code == 200) {
|
||||
openid.value = wx.data;
|
||||
uni.setStorageSync('wechat_user', info.data);
|
||||
phone.value = info.data.mobile;
|
||||
if (!info.data.nickname) {
|
||||
@ -98,12 +98,12 @@
|
||||
}
|
||||
} else {
|
||||
let params = {
|
||||
"openid": wx.data,
|
||||
"openId": wx.data,
|
||||
"status": 1,
|
||||
}
|
||||
api.callOrdereApi("ebikeUser/save", params).then(
|
||||
re => {
|
||||
if (re.code == 200) {
|
||||
if (re.code == 200) {
|
||||
params.userId = re.data;
|
||||
uni.setStorageSync('wechat_user',
|
||||
params);
|
||||
@ -142,7 +142,6 @@
|
||||
let wechat_user = uni.getStorageSync('wechat_user');
|
||||
const params = {
|
||||
"userId": wechat_user.userId,
|
||||
"openid": openid.value,
|
||||
"nickname": res.userInfo.nickName,
|
||||
"avatar": res.userInfo.avatarUrl
|
||||
};
|
||||
@ -172,7 +171,7 @@
|
||||
// 获取到手机号的加密数据
|
||||
wx.login({
|
||||
success: (res) => {
|
||||
let wechat_user = uni.getStorageSync('wechat_user');
|
||||
let wechat_user = uni.getStorageSync('wechat_user');
|
||||
const encryptedData = e.detail.encryptedData;
|
||||
const iv = e.detail.iv;
|
||||
const param = {
|
||||
@ -185,7 +184,6 @@
|
||||
//更新手机号
|
||||
const params = {
|
||||
"userId": wechat_user.userId,
|
||||
"openid": openid.value,
|
||||
"mobile": info.data
|
||||
}
|
||||
phone.value = info.data;
|
||||
@ -220,9 +218,9 @@
|
||||
showModelMessage("您的账户已经注销,请联系管理员!");
|
||||
} else {
|
||||
// 调用 wx.login 获取登录凭证 code
|
||||
login();
|
||||
setTimeout(() => {
|
||||
uni.switchTab({
|
||||
login();
|
||||
setTimeout(() => {
|
||||
uni.navigateTo({
|
||||
url: "/pages/user/home/home"
|
||||
})
|
||||
}, 500);
|
||||
|
||||
@ -147,7 +147,7 @@
|
||||
if(code==200){
|
||||
showModelMessage("提交成功!");
|
||||
setTimeout(()=>{
|
||||
uni.switchTab({
|
||||
uni.navigateTo({
|
||||
url:"/pages/user/home/home"
|
||||
})
|
||||
},2000);
|
||||
|
||||
@ -107,7 +107,7 @@ function saveRide(params, icnt, callback) {
|
||||
}
|
||||
if(callback)callback(true);
|
||||
setTimeout(() => {
|
||||
uni.switchTab({
|
||||
uni.navigateTo({
|
||||
url: "/pages/user/home/home"
|
||||
})
|
||||
}, 1000)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user