From 3254ba30e7282d78dde0a351e0f0be263d284b56 Mon Sep 17 00:00:00 2001
From: 13405411873 <1994398261@qq.com>
Date: Thu, 26 Sep 2024 18:44:42 +0800
Subject: [PATCH] idea

---
 App.vue                         |    6 +-
 config.js                       |    4 +-
 main.js                         |    6 +-
 manifest.json                   |    6 +-
 package.json                    |    4 +-
 pages.json                      |   27 +-
 pages/login/login.vue           | 1111 +++++++++++++++----------------
 pages/my/my.vue                 |   19 +-
 pages/my/register.vue           |   38 +-
 pages/orderList/orderList.vue   |    2 +-
 pages/shopDetail/shopDetail.vue |   14 +-
 uni.scss                        |    1 +
 12 files changed, 637 insertions(+), 601 deletions(-)

diff --git a/App.vue b/App.vue
index 8bd670e..77fd51d 100644
--- a/App.vue
+++ b/App.vue
@@ -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,
diff --git a/config.js b/config.js
index 6c7204a..3854937 100644
--- a/config.js
+++ b/config.js
@@ -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
diff --git a/main.js b/main.js
index c1caf36..b2573a8 100644
--- a/main.js
+++ b/main.js
@@ -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'
diff --git a/manifest.json b/manifest.json
index 62f25af..803c679 100644
--- a/manifest.json
+++ b/manifest.json
@@ -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" : "智修小助手"
     },
diff --git a/package.json b/package.json
index 7a6830e..2db41f6 100644
--- a/package.json
+++ b/package.json
@@ -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"
   }
 }
diff --git a/pages.json b/pages.json
index 72b487d..87e5903 100644
--- a/pages.json
+++ b/pages.json
@@ -1,17 +1,14 @@
 {
-	"pages": [ //pages数组中第一项表示应用启动页，参考：https://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": [ //pages数组中第一项表示应用启动页，参考：https://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" :
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 2abe838..80f2763 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -1,573 +1,554 @@
 <template>
-  <view class="content">
-<!--    <view class="top">-->
-<!--      <view class="touxiang">-->
-<!--        <image src="../../static/xinlogo.png" mode=""></image>-->
-<!--      </view>-->
-<!--      <view class="inputs">-->
-<!--        <input type="text" v-model="userName" placeholder="请输入用户名">-->
-<!--      </view>-->
-<!--      <view class="inputs">-->
-<!--        <input type="password" v-model="wrod" placeholder="请输入密码">-->
-<!--      </view>-->
-<!--      <view class="wjworb" @click="goforgot()">-->
-<!--        <view class="">忘记密码</view>-->
-<!--      </view>-->
-<!--    </view>-->
-<!--    <view class="dl" @click="getlogin()">-->
-<!--      <text>登 录</text>-->
-<!--    </view>-->
-<!--    &lt;!&ndash; 	<view class="hging">-->
-<!--      <text>没有账号？</text>-->
-<!--      <text style="color: #0078FF;" @click="goregister()">立即注册</text>-->
-<!--    </view> &ndash;&gt;-->
-<!--    <view class="dbottom">-->
-<!--      <view class="quanzi" v-if="qindex == false " @click="qindex =! qindex"></view>-->
-<!--      <view class="lanquanzi" v-if="qindex == true" @click="qindex =! qindex">-->
-<!--        <uni-icons type="checkmarkempty" color="#ffffff" size="14"></uni-icons>-->
-<!--      </view>-->
-<!--      <text>请仔细阅读</text>-->
-<!--      <text class="lan">《用户协议》</text>-->
-<!--      <text>和</text>-->
-<!--      <text class="lan">《隐私政策》</text>-->
-<!--    </view>-->
-  </view>
+	<view class="content">
+	
+		<view class="kuang">
+			<view class="land">您好，</view>
+			<view class="land">欢迎登录智修小助手</view>
+		</view>
+		<view class="xiaoannoi">
+			<u-button v-if="privacyPolicyChecked == true"  text="手机号快捷登录" class="dl" :customStyle="{color:'#ffffff'}"
+				color="#0D2E8D" open-type='getPhoneNumber'
+				@getphonenumber="getPhone"></u-button>
+			<u-button v-else text="手机号快捷登录" class="dl" :customStyle="{color:'#ffffff'}"
+					color="#0D2E8D" @click="shibai()" ></u-button>
+		</view>
+		<view class="dbottom">
+			
+			<view class="axquan"  v-if="privacyPolicyChecked == false" @click="privacyPolicyChecked = true"></view>
+			<view class="axquanl" v-if="privacyPolicyChecked == true" @click="privacyPolicyChecked = false">
+				<uni-icons type="checkmarkempty" color="#ffffff" size="14"></uni-icons>
+			</view>
+			<text>请您认真阅读</text>
+			<text class="lan"  @click="goPolicy()">《用户协议》</text>
+			<text>和</text>
+			<text class="lan" @click="goPolicy()">《隐私政策》</text>
+		</view>
+	</view>
 </template>
 
 <script>
-import request from '../../utils/request';
-import {
-  loginAppuserName,
-} from '@/api/login.js';
-import {
-  setToken,
-  getToken,
-  setTenantId,
-  removeToken
-} from '@/utils/auth.js'
-import {
-  login,
-  getInfo,
-  getTenantIdByWebsite
-} from '@/api/login.js'
-import drawQrcode from "weapp-qrcode";
+	import request from '../../utils/request';
+	import {setToken} from '@/utils/auth.js'
+	export default{
+		data(){
+			return{
+				yd : false,
+				shenfen:'jcyh',
+				show:false,
+				baseUrl:this.$baseUrl,
+				privacyPolicyChecked:false,
+				phoneNumber: "",
+				isButtonDisabled: false,
+				countdownTime: 60,
+				qh:[
+					{text:'密码登录'},
+					{text:'验证码登录'}
+				],
+				 columns: [
+					 ['用户','代办' ]
+				    ],
+				tel:'',
+				yzm:'',
+				wrod:'',
+				activeid:0
+			}
+		},
+		onLoad() {
+			this.wxlogin()
+		},
+		computed: {
+		   buttonText() {
+		     if (this.isButtonDisabled) {
+		       return `${this.countdownTime}s 后重新发送`;
+		     } else {
+		       return "获取验证码";
+		     }
+		   },
+		 }, 
+		methods:{
+			async getsxshenfen(){
+				let data = {
+					roleCode : this.shenfen
+				}
+				let res = await request({
+					url:'/appInspection/userOwn/updateRole',
+					method:'post',
+					params: data
+				})
+				if(res.code == 200){
+					uni.redirectTo({
+						url: '/pages/detection/my'
+					})
+				}
+			},
+			getshenfen(text){
+				this.shenfen = text
+				
+			},
+		   open() {
+		        // console.log('open');
+		      },
+			 
+			      close() {
+			  //       this.show = false
+					// uni.reLaunch({
+					// 	url: '/pages/detection/my'
+					// })
+			  //       // console.log('close');
+			      },
+			goPolicy() {
+				uni.navigateTo({
+					url: "/pages/login/PrivacyPolicy"
+				})
+			},
+			wxlogin() {
+				uni.login({
+					provider: 'weixin',
+					success(res) {
+						console.log(543, res);
+						if (res.code) {
+							uni.setStorageSync('c1', res.code);
+						} else {
+							console.log('登录失败！' + res.errMsg)
+						}
+					}
+				})
+			},
+			async getAppinfo(){
+				let res = await request({
+					url:'/getAppInfo',
+					method:'get',
+				})
+				console.log('getappinfo',res);
+			},
+			//授权
+			authorize() {
+				uni.showToast({
+					icon: "none",
+					title: "请阅读并勾选用户协议",
+					duration: 2000
+				})
+			},
+			shibai(){
+				uni.showToast({
+					icon: "none",
+					title: "请阅读并勾选用户协议",
+					duration: 2000
+				})
+			},
+			getPhone(e) {
+				console.log('执行了');
+				if (this.privacyPolicyChecked == false) {
+					uni.showToast({
+						icon: "none",
+						title: "请阅读并勾选用户协议",
+						duration: 2000
+					})
+					return;
+				}
+				
+				
+					uni.checkSession({
+						success: () => {
+							uni.request({
+								url: this.baseUrl + "/userClient/repair/wxLogin",
+								method: "POST",
+								data: {
+									code: uni.getStorageSync('c1'),
+									encryptedIv: e.detail.iv,
+									encryptedData: e.detail.encryptedData,
+									inviteId: uni.getStorageSync('inviteId')?uni.getStorageSync('inviteId'):null
+								},
+								success: (rex) => {
+									
+									if (rex.data.code == 0) {
+										if (this.loginStatus) {
+											clearInterval(this.loginStatus)
+										}
+										uni.setStorageSync('App-Token', rex.data.data.token);
+										if (this.returnUrl) {
+										
+											uni.navigateBack()
+										} else {
+											//this.userinfo()
+											console.log('跳转');
+											uni.reLaunch({
+												url: '/pages/home/home'
+											})
+										}
+									} else {
+										uni.showToast({
+											icon: 'none',
+											title: '登录失败，请联系管理人员'
+										})
+									}
+								},
+								fail: (res) => {
+									console.log("fail", res);
+									uni.showToast({
+										icon: "error",
+										title: "登录失败，请重新点击并授权！",
+										duration: 2000
+									})
+								}
+							})
+						},
+						fail: () => {
+							uni.showToast({
+								icon: 'error',
+								duration: 2000,
+								title: "登录状态过期，重新登录"
+							});
+						}
+					})
+			
+				
+			},
+			
+			userinfo(){
+				console.log('执行了');
+				request({
+					url: '/getAppInfo',
+					method: 'get',
+					
+				}).then((res)=>{
+					let userJson = {}
+					userJson.userId = res.user.userId
+					console.log('身份信息',res,res.role.length);
+					uni.setStorageSync('role',res.role)
+					uni.setStorageSync('userinfo',res.user)
+					if(!res.role||res.role.length==0){
+						this.show = true
+					}else{
+						uni.reLaunch({
+							url: '/pages/detection/my'
+						})
+					}
+		
+				
+				})
+			},
+			// let roles=[];
+			// let jcshopRole = false;
+			//  let jcgfRole = false;
+			// roles.forEach(it->{
+			// 	if(it=='jcshop'){
+			// 		jcshopRole = true
+			// 	}
+			// 	if(it=='jcgf'){
+			// 		jcgfRole = true
+			// 	}
+			// })
+			getxz(index){
+				this.activeid = index
+			},
+			goregister(){
+				uni.redirectTo({
+					url:'/pages/login/register'
+				})
+			},
+			goforgot(){
+				uni.redirectTo({
+					url:'/pages/login/forgot'
+				})
+			},
+			goselect(){
+				console.log('执行');
+				uni.redirectTo({
+					url:'/pages/index/index'
+				})
+			},
+			// 验证码方法
+			sendVerificationCode() {
+				let reg = /^((13[0-9])|(14[0-9])|(15[0-9])|(17[0-9])|(18[0-9]))\d{8}$/;
+				if (!reg.test(this.tel)) {
+					uni.showToast({
+						icon: 'none',
+						title: '请输入正确的11位手机号'
+					})
+					this.tel = '';
+					return false;
+				}
+			  if (this.isButtonDisabled) {
+			    return; // 如果按钮已禁用，则直接返回
+			  }
+						const data = {
+							  phone:this.tel,
+						  }
+						request({
+						  url: '/loginSmsCode',
+						  method: 'post',
+						  params: data
+						}).then((res)=>{
+							console.log('验证码',res);
+							if(res.code == 200){
+								uni.showToast({
+									title:'验证码已发送 请注意查收',
+									icon:'none'
+								})
+							}else{
+								uni.showToast({
+									title:'网络不佳请稍后再试',
+									icon:'none'
+								})
+							}
+						})
 
-export default {
-  data() {
-    return {
-      //用户微信openId
-      openId: "",
-      phoneNumber: "",
-      baseUrl: this.$baseUrl,
-      isButtonDisabled: false,
-      countdownTime: 60,
-      qindex: false,
-      sfindex: 'user',
-      userName: '',
-      yzm: '',
-      wrod: '',
-      activeid: 0,
-      tenantCode: 'lanan',
-      // 标志位，初始值为false
-      isFirstLoad: false
-    }
-  },
-  computed: {
-    groupChange(n) {
-      console.log('groupChange', n);
-    },
-    radioChange(n) {
-      console.log('radioChange', n);
-    },
-    buttonText() {
-      if (this.isButtonDisabled) {
-        return `${this.countdownTime}s 后重新发送`;
-      } else {
-        return "获取验证码";
-      }
-    },
-  },
-  mounted() {
-  },
-  created(){
-    // 如果是第一次加载，执行一些初始化操作
-    if (!this.isFirstLoad) {
-      this.isFirstLoad = true;
-      // 初始化代码
-      this.checkIfLogin()
-    }
-  },
-  onShow() {
-    // 如果不是第一次加载，不执行任何操作
-    if (this.isFirstLoad) {
-      // 每次页面显示时需要做的操作
-      if(getToken()){
-        //已登录
-        uni.reLaunch({
-          url: '/pages/home/home'
-        })
-      }else {
-        uni.showModal({
-          title: '提示',
-          content: '请关闭本页面重新打开',
-          success: function (res) {
-            if (res.confirm) {
-              console.log('用户点击确定');
-              // 用户点击了确定按钮的相关逻辑可以在这里编写
-            } else if (res.cancel) {
-              console.log('用户点击取消');
-              // 用户点击了取消按钮的相关逻辑可以在这里编写
-            }
-          }
-        });
-      }
-    }
-  },
-
-  methods: {
-    checkIfLogin(){
-      if(getToken()){
-        //已登录
-        uni.reLaunch({
-          url: '/pages/home/home'
-        })
-      }else{
-        //未登录
-        this.checkIfCode()
-      }
-    },
-    /**
-     *判断是否有code
-     * */
-    checkIfCode(){
-      let code = this.getUrlCode('code')
-      if (code !== null && code !== "") {
-        //自动登录
-        this.getOpenidAndUserinfo(code)
-      } else {
-        uni.showToast({
-          title: '未获取到授权信息，请重新进入！！',
-          icon: 'none'
-        })
-      }
-    },
-    /**
-     * 微信自动登录
-     * @param {Object} code 用户code
-     */
-    async getOpenidAndUserinfo(code) {
-      await request({
-        url: '/userClient/weChat/wechatLogin',
-        method: 'get',
-        params: {code:code}
-      }).then((res) => {
-        if (res.code==200) {
-          if(res.data.hasOwnProperty("accessToken")){
-            setToken(res.data.accessToken)
-            uni.reLaunch({
-              url: '/pages/home/home'
-            })
-          }else{
-            //去注册
-            this.openId = res.data
-            //跳转到注册页
-            this.goregister()
-          }
-        } else {
-          uni.showToast({
-            title: res.msg,
-            icon: 'none'
-          })
-        }
-      })
-    },
-    /**
-     * 获取路径中的参数
-     * @param {Object} name
-     */
-    getUrlCode(name) {
-      return decodeURIComponent((new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(location.href) || [, ''])[1].replace(/\+/g, '%20')) || null
-    },
-    setidentity(text) {
-      this.sfindex = text
-
-    },
-    //登录请求
-    getlogin() {
-      if (this.qindex != true) {
-        uni.showToast({
-          icon: "none",
-          title: "请阅读并勾选用户协议",
-          duration: 2000
-        })
-        return;
-      }
-      if (this.userName == '') {
-        uni.showToast({
-          title: '输入框不能为空！',
-          icon: 'none'
-        })
-        return
-      }
-
-      uni.setStorageSync('identity', this.sfindex);
-
-      const loginFun = () => {
-        const data = {
-          username: this.userName,
-          password: this.wrod,
-          type: 0
-        }
-        loginAppuserName(data).then(res => {
-          if (res.code==200) {
-            if(res.data.hasOwnProperty("accessToken")){
-              setToken(res.data.accessToken)
-              uni.reLaunch({
-                url: '/pages/home/home'
-              })
-            }else{
-              uni.showToast({
-                title: '登录失败',
-                icon: 'none'
-              })
-            }
-          } else {
-            uni.showToast({
-              title: res.msg,
-              icon: 'none'
-            })
-          }
-          // if (res.data.needMobile === "1") {
-          //   uni.navigateTo({
-          //     url: '/pages/login/bindPhoe'
-          //   })
-          //   uni.setStorageSync('validaCodeToken', res.data.accessToken)
-          // } else {
-          //   setToken(res.data.accessToken)
-          //   uni.reLaunch({
-          //     url: '/pages/home/home'
-          //   })
-          // }
-        })
-      }
-
-      getTenantIdByWebsite(this.tenantCode).then(res => {
-        if (res.code === 200 && res.data && res.data.length > 0) {
-          uni.showActionSheet({
-            itemList: res.data.map(m => m.name),
-            success: ({
-                        tapIndex
-                      }) => {
-              setTenantId(res.data[tapIndex].id)
-              loginFun()
-            }
-          })
-        } else {
-          setTenantId('')
-          loginFun()
-        }
-      })
-    },
-    getxz(index) {
-      this.activeid = index
-    },
-    goregister() {
-      uni.navigateTo({
-        url: '/pages/my/register?openId='+this.openId
-      })
-    },
-    goforgot() {
-      uni.navigateTo({
-        url: '/pages/login/forgot'
-      })
-    },
-    goselect() {
-      console.log('执行去救援', this.sfindex);
-      // pages/rescue/trafficPolice
-      if (this.sfindex == 'police') {
-        uni.reLaunch({
-          url: '/pages/rescue/trafficPolice'
-        })
-      } else {
-        uni.reLaunch({
-          url: '/pages/rescue/rescue'
-        })
-      }
-
-    },
-    // 验证码方法
-    sendVerificationCode() {
-      let reg = /^((13[0-9])|(14[0-9])|(15[0-9])|(17[0-9])|(18[0-9]))\d{8}$/;
-      if (!reg.test(this.userName)) {
-        uni.showToast({
-          icon: 'none',
-          title: '请输入正确的11位手机号'
-        })
-        this.userName = '';
-        return false;
-      }
-      if (this.isButtonDisabled) {
-        return; // 如果按钮已禁用，则直接返回
-      }
-      const data = {
-        phone: this.userName,
-      }
-      request({
-        url: '/loginSmsCode',
-        method: 'post',
-        params: data
-      }).then((res) => {
-        console.log('验证码', res);
-        if (res.code == 200) {
-          uni.showToast({
-            title: '验证码已发送 请注意查收',
-            icon: 'none'
-          })
-        } else {
-          uni.showToast({
-            title: '网络不佳请稍后再试',
-            icon: 'none'
-          })
-        }
-      })
-
-
-      this.disableButton(); // 禁用按钮
-      this.startCountdown(); // 启动倒计时
-
-    },
-    disableButton() {
-      this.isButtonDisabled = true;
-    },
-    enableButton() {
-      this.isButtonDisabled = false;
-    },
-    startCountdown() {
-      let countdown = setInterval(() => {
-        this.countdownTime--;
-        if (this.countdownTime === 0) {
-          clearInterval(countdown);
-          this.enableButton(); // 启用按钮
-        }
-      }, 1000);
-    },
-  }
-}
+						
+			    this.disableButton(); // 禁用按钮
+			    this.startCountdown(); // 启动倒计时
+			 
+			},
+			disableButton() {
+			  this.isButtonDisabled = true;
+			},
+			enableButton() {
+			  this.isButtonDisabled = false;
+			},
+			startCountdown() {
+			  let countdown = setInterval(() => {
+			    this.countdownTime--;
+			    if (this.countdownTime === 0) {
+			      clearInterval(countdown);
+			      this.enableButton(); // 启用按钮
+			    }
+			  }, 1000);
+			},
+		}
+	}
+	
 </script>
 
 <style scoped lang="scss">
-.jsq {
-  border: none !important;
-  font-size: 14px;
-  font-weight: 400;
-  color: #0078FF;
-}
-
-button {
-  border: none !important;
-  background: none !important;
-  margin: 0px;
-  display: block;
-}
-
-button:focus {
-  color: #0078FF;
-  outline: none;
-  box-shadow: none;
-}
-
-.content {
-  box-sizing: border-box;
-}
-
-.top {
-  box-sizing: border-box;
-  padding: 0px 27px;
-  padding-top: 100px;
-  background-image: url('../../static/loginbj.png');
-  // background-color:lightseagreen;
-  // background-image: url('../../static/loginbj.png');
-  background-size: cover;
-  background-position: center;
-  width: 100%;
-  // height: 385px;
-}
-
-.touxiang {
-  width: 88px;
-  height: 88px;
-  border-radius: 10px;
-  background: #D7D7D7;
-  margin: 0 auto;
-  margin-bottom: 40px;
-  overflow: hidden;
-
-  image {
-    width: 100%;
-    height: 100%;
-  }
-}
-
-.twotap {
-  width: 100%;
-  display: flex;
-  align-items: center;
-
-  view {
-    font-size: 15px;
-    font-family: Microsoft YaHei;
-    font-weight: 400;
-    color: #666666;
-    margin-right: 38.5px;
-  }
-}
-
-.blck {
-  color: #333333 !important;
-  font-weight: bold !important;
-}
-
-.inputs {
-  box-sizing: border-box;
-  padding: 16px 0px;
-  display: flex;
-  align-items: center;
-  border-bottom: 2px solid #E8E8E8;
-  margin-top: 20px;
-}
-
-.wjworb {
-  margin-top: 5px;
-  width: 100%;
-  display: flex;
-  font-size: 12px;
-  color: #0078FF;
-  justify-content: flex-end;
-  align-items: center;
-
-}
-
-.dl {
-  width: 90%;
-  height: 44px;
-  background: linear-gradient(-46deg, #0853C4 0%, #4282D8 80%);
-  border-radius: 5px;
-  margin: 0 auto;
-  font-size: 16px;
-  color: #FFFFFF;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  margin-top: 22px;
-}
-
-.hging {
-  width: 100%;
-  text-align: center;
-  font-size: 14px;
-  font-weight: 400;
-  color: #636363;
-  margin-top: 20px;
-}
-
-.wx {
-  width: 38px;
-  height: 38px;
-  overflow: hidden;
-  box-sizing: border-box;
-  margin: 0px auto;
-  margin-top: 20px;
-
-  image {
-    width: 100%;
-    height: 100%;
-  }
-}
-
-.hui {
-  font-size: 10px;
-  width: 100%;
-  text-align: center;
-  font-weight: 400;
-  color: #666666;
-}
-
-.dbottom {
-  width: 100%;
-  text-align: center;
-  font-size: 12px;
-  color: #333333;
-  margin-top: 40px;
-  position: fixed;
-  bottom: 25px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.quanzi {
-  width: 14px;
-  height: 14px;
-  border: 1px solid #666666;
-  border-radius: 50%;
-  margin-right: 10px;
-}
-
-.lanquanzi {
-  width: 14px;
-  height: 14px;
-  border: 1px solid #0078FF;
-  border-radius: 50%;
-  margin-right: 10px;
-  background: #0078FF;
-  color: white;
-}
-
-.lan {
-  color: #0078FF;
-}
-
-.jiuzhong {
-  width: 90%;
-  margin: 10px auto;
-  display: flex;
-  align-items: center;
-}
-
-.dist {
-  display: flex;
-  align-items: center;
-  margin: 0px 10px;
-}
-
-.d-zi {
-  font-size: 14px;
-}
-
-.d-qian {
-  width: 14px;
-  height: 14px;
-  margin-right: 5px;
-  overflow: hidden;
-  border-radius: 50%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  border: 1px solid #666666;
-  color: white;
-}
-
-.d-qian-lan {
-  width: 14px;
-  height: 14px;
-  margin-right: 5px;
-  overflow: hidden;
-  border-radius: 50%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  background: #0078FF;
-  border: 1px solid #0078FF;
-  color: white;
-}
-</style>
+	.jsq{
+		border: none !important;
+		font-size: 14px;
+		font-weight: 400;
+		color: #0078FF;
+	}
+	.anniu{
+		width: 150px;
+		height: 40px;
+		border-radius: 50px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		color: white;
+		background: #0D2E8D;
+		color: #FFFFFF;
+		margin: 0 auto;
+	}
+	.cont-popup{
+		height: 250px;
+		width: 300px;
+		background-color: #FFFFFF;
+		box-sizing: border-box;
+		padding: 15px;
+		border-radius: 10px;
+	}
+	.popup-title{
+		width: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 18px;
+		font-weight: bold;
+		color: #0D2E8D;
+	}
+	.dix{
+		width: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		margin: 20px 0px;
+		font-size: 18px;
+		font-weight: bold;
+	}
+	.lqiu{
+		width: 15px;
+		height: 15px;
+		border-radius: 50%;
+		border: 1px solid #0D2E8D;
+		background: #0D2E8D;
+		color: white;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+	.qiu{
+		width: 15px;
+		height: 15px;
+		border-radius: 50%;
+		border: 1px solid #E8E8E8;
+	}
+	button {
+	  border: none !important;
+	  background: none !important;
+	  margin: 0px;
+	   display: block;
+	}
+	button:focus {
+		color: #0078FF;
+	  outline: none;
+	  box-shadow: none;
+	}
+	.content{
+		box-sizing: border-box;
+		padding-top: 1px;
+		background-image: url('http://www.nuoyunr.com/lananRsc/jdc-bj.png');
+	
+		background-size: cover;
+		width: 100%;
+		height: calc(100vh);
+	}
+	.top{
+		box-sizing: border-box;
+		padding: 0px 27px;
+		padding-top: 100px;
+		
+		
+		// background-color:lightseagreen;
+	
+		background-position: center;
+		width: 100%;
+		// height: 385px;
+	}
+	.touxiang{
+		width: 88px;
+		height: 88px;
+		border-radius: 10px;
+		background: #D7D7D7;
+		margin: 0 auto;
+		margin-bottom: 40px;
+		overflow: hidden;
+		image{
+			width: 100%;
+			height: 100%;
+		}
+	}
+	.twotap{
+		width: 100%;
+		display: flex;
+		align-items: center;
+		view{
+			font-size: 15px;
+			font-family: Microsoft YaHei;
+			font-weight: 400;
+			color: #666666;
+			margin-right: 38.5px;
+		}
+	}
+	.blck{
+		color: #333333 !important;
+		font-weight: bold !important;
+	}
+	.inputs{
+		box-sizing: border-box;
+		padding: 16px 0px;
+		display: flex;
+		align-items: center;
+		border-bottom: 2px solid #E8E8E8 ;
+		margin-top: 20px;
+	}
+	.wjworb{
+		margin-top: 5px;
+		width: 100%;
+		display: flex;
+		font-size: 12px;
+		color: #0078FF;
+		justify-content: flex-end;
+		align-items: center;
+		
+	}
+	.dl{
+		width: 90%;
+		height: 44px;
+		background-color: #0D2E8D;
+		border-radius: 50px;
+		margin: 0 auto;
+		font-size: 16px;
+		color: #FFFFFF;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		margin-top: 300px;
+	}
+	 .xiaoannoi{
+		width: 90%;
+		height: 40px;
+		margin: 0 auto;
+		border-radius: 50px;
+		overflow: hidden;
+		margin-top: 300px;
+	 }
+	.hging{
+		width: 100%;
+		text-align: center;
+		font-size: 14px;
+		font-weight: 400;
+		color: #636363;
+		margin-top: 20px;
+	}
+	.wx{
+		width: 38px;
+		height: 38px;
+		overflow: hidden;
+		box-sizing: border-box;
+		margin: 0px auto;
+		margin-top: 20px;
+		image{
+			width: 100%;
+			height: 100%;
+		}
+	}
+	.hui{
+		font-size: 10px;
+		width: 100%;
+		text-align: center;
+		font-weight: 400;
+		color: #666666;
+	}
+	.dbottom{
+		width: 100%;
+		text-align: center;
+		font-size: 12px;
+		color: #333333;
+		margin-top: 40px;
+		position: fixed;
+		bottom: 25px;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+	
+	.lan{
+		color: #0D2E8D;
+	}
+	.land{
+		
+		font-size: 25px;
+		font-weight: bold;
+		color: #0D2E8D;
+		margin-bottom: 5px;
+	}
+	.kuang{
+		width: 90%;
+		margin: 0 auto;
+		margin-top: 100px;
+	}
+	.axquan{
+		width: 18px;
+		height: 18px;
+		border-radius: 50%;
+		border: 1px solid #AAAAAA;
+		margin-right: 5px;
+	}
+	.axquanl{
+		width: 18px;
+		height: 18px;
+		border-radius: 50%;
+		border: 1px solid #AAAAAA;
+		margin-right: 5px;
+		background-color: #0D2E8D;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 8e46126..7d61712 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -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>
diff --git a/pages/my/register.vue b/pages/my/register.vue
index d9238e1..b36360a 100644
--- a/pages/my/register.vue
+++ b/pages/my/register.vue
@@ -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>
diff --git a/pages/orderList/orderList.vue b/pages/orderList/orderList.vue
index 862d3c9..ff807de 100644
--- a/pages/orderList/orderList.vue
+++ b/pages/orderList/orderList.vue
@@ -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>
diff --git a/pages/shopDetail/shopDetail.vue b/pages/shopDetail/shopDetail.vue
index 4b26137..0b48eda 100644
--- a/pages/shopDetail/shopDetail.vue
+++ b/pages/shopDetail/shopDetail.vue
@@ -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() {
diff --git a/uni.scss b/uni.scss
index b9249e9..a7c484e 100644
--- a/uni.scss
+++ b/uni.scss
@@ -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';
\ No newline at end of file