This commit is contained in:
13405411873 2024-09-26 18:44:42 +08:00
parent 90cf155a95
commit 3254ba30e7
12 changed files with 637 additions and 601 deletions

View File

@ -1,4 +1,5 @@
<script>
export default {
onLaunch: function() {
console.log('App Launch')
@ -11,7 +12,10 @@
}
}
</script>
<style lang="scss">
/* 注意要写在第一行同时给style标签加入lang="scss"属性 */
@import "uview-ui/index.scss";
</style>
<style>
/*每个页面公共css */
page,

View File

@ -1,14 +1,14 @@
// 应用全局配置
module.exports = {
baseUrl: 'https://www.nuoyunr.com',
//baseUrl: 'http://192.168.1.4:48080/userClient',
//baseUrl: 'http://192.168.1.31:48080',
imagesUrl: 'http://shequ.0315e.com/static/images/pages/',
baseImageUrl: 'https://www.nuoyunr.com/minio/',
wsUrl: 'wss://www.nuoyunr.com',
// 应用信息
appInfo: {
// 应用名称
name: "道路救援",
name: "智修小助手",
// 应用版本
version: "2.6",
// 应用logo

View File

@ -1,5 +1,9 @@
import App from './App'
import uView from "uview-ui";
import config from '@/config'
const baseUrl = config.baseUrl
Vue.prototype.$baseUrl = baseUrl;
Vue.use(uView);
// #ifndef VUE3
import Vue from 'vue'
import './uni.promisify.adaptor'

View File

@ -1,6 +1,6 @@
{
"name" : "智修小助手",
"appid" : "__UNI__D307B2B",
"appid" : "__UNI__DA69B61",
"description" : "",
"versionName" : "1.0.0",
"versionCode" : "100",
@ -50,7 +50,7 @@
"quickapp" : {},
/* */
"mp-weixin" : {
"appid" : "",
"appid" : "wxee677d54037bc5ac",
"setting" : {
"urlCheck" : false,
"es6" : true
@ -76,7 +76,7 @@
"devServer" : {
"port" : 8080,
"disableHostCheck" : true,
"https" : true
"https" : false
},
"title" : "智修小助手"
},

View File

@ -4,7 +4,7 @@
"weapp-qrcode": "^1.0.0"
},
"devDependencies": {
"sass": "^1.69.5",
"sass-loader": "^10.4.1"
"sass": "^1.79.3",
"sass-loader": "^10.5.2"
}
}

View File

@ -1,17 +1,14 @@
{
"pages": [ //pageshttps://uniapp.dcloud.io/collocation/pages
// {
// "path": "pages/index/index",
// "style": {
// "navigationBarTitleText": "uni-app"
// }
// },
{
"path": "pages/login/login",
"style": {
"navigationBarTitleText": "uni-app"
}
"easycom": {
"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
},
"pages": [ //pageshttps://uniapp.dcloud.io/collocation/pages
// // {
// // "path": "pages/index/index",
// // "style": {
// // "navigationBarTitleText": "uni-app"
// // }
// // },
{
"path" : "pages/home/home",
"style" :
@ -19,6 +16,12 @@
"navigationBarTitleText" : ""
}
},
{
"path": "pages/login/login",
"style": {
"navigationBarTitleText": "uni-app"
}
},
{
"path" : "pages/orderList/orderList",
"style" :

File diff suppressed because it is too large Load Diff

View File

@ -65,13 +65,16 @@
import VNavigationBar from '@/components/VNavigationBar.vue'
import tabBarVue from '@/components/tabBar/tabBar.vue'
import request from "@/utils/request";
import {getToken} from '@/utils/auth.js'
export default {
components: {
tabBarVue,
VNavigationBar
},
onShow(data) {
this.getServer()
if(getToken()){
this.getServer()
}
},
data() {
return {
@ -107,9 +110,17 @@
method: 'get',
params:{}
})
this.customInfo = res.data
uni.setStorageSync('customerInfo', JSON.stringify(this.customInfo))
}
if(!res.data){
uni.reLaunch({
url: '/pages/my/register'
})
}else{
this.customInfo = res.data
uni.setStorageSync('customerInfo', JSON.stringify(this.customInfo))
}
}
}
}
</script>

View File

@ -1,6 +1,12 @@
<template>
<view class="container">
<VNavigationBar title-color="#333" background-color="#fff" title="注册会员"></VNavigationBar>
<!-- <VNavigationBar title-color="#333" background-color="#fff" title="注册会员"></VNavigationBar> -->
<view class="top_Bar">
<uni-icons @click="goHome()" size="24" type="left"
color="#000" style="margin-left: 10px;" ></uni-icons>
<view class="title_top">注册会员</view>
<view style="width: 24px;height: 24px;"></view>
</view>
<view class="body">
<view class="formItem">
<view class="formLabel">姓名</view>
@ -94,6 +100,11 @@ export default {
this.formData.openId = e.openId
},
methods: {
goHome(){
uni.reLaunch({
url:'/pages/home/home'
})
},
/**
* 注册
*/
@ -108,12 +119,9 @@ export default {
data: this.formData
}).then((res) => {
if (res.code==200) {
if(res.data.hasOwnProperty("accessToken")){
setToken(res.data.accessToken)
uni.reLaunch({
url: '/pages/home/home'
})
}
uni.reLaunch({
url: '/pages/home/home'
})
} else {
uni.showToast({
title: res.msg,
@ -316,4 +324,20 @@ export default {
align-items: center;
margin-top: 22px;
}
.top_Bar{
width: 100%;
height: 40px;
display: flex;
align-items: center;
justify-content: space-between;
padding-top: 44px;
}
.title_top{
font-size: 36rpx;
font-weight: bold;
}
</style>

View File

@ -37,7 +37,7 @@
<text>{{ formatTimestamp(item.createTime) }}</text>
</view>
<view class="line3">
<view v-if="item.orderStatus == '0'" @click="goPay(item)" class="showOrder">支付</view>
<!-- <view v-if="item.orderStatus == '0'" @click="goPay(item)" class="showOrder">支付</view> -->
<view v-if="item.goodsType == '2'" @click="gotoDetail(item)" class="showOrder">查看订单</view>
<view @click="gotoEvaluate(item)" class="evaluate" v-if="item.goodsType == '2' && item.orderStatus === '1' && !item.commentDesc">评价订单</view>
</view>

View File

@ -74,6 +74,7 @@
<script>
import VNavigationBar from '@/components/VNavigationBar.vue'
import request from "../../utils/request";
import {getToken} from '@/utils/auth.js'
export default {
components: {
VNavigationBar
@ -110,9 +111,16 @@
methods: {
//
gotoReservation() {
uni.navigateTo({
url: '/pages/myReservation/addReservation?info=' + encodeURIComponent(JSON.stringify(this.info))
})
if(getToken()){
uni.navigateTo({
url: '/pages/myReservation/addReservation?info=' + encodeURIComponent(JSON.stringify(this.info))
})
}else{
uni.navigateTo({
url: '/pages/login/login'
})
}
},
//
async getServer() {

View File

@ -74,3 +74,4 @@ $uni-color-subtitle: #555555; // 二级标题颜色
$uni-font-size-subtitle:26px;
$uni-color-paragraph: #3F536E; // 文章段落颜色
$uni-font-size-paragraph:15px;
@import 'uview-ui/theme.scss';