修改跳转

config/host.js

@@ -1,5 +1,5 @@
 // const host='http://192.168.2.92:9505/api'
-const host='https://nxr.fanyiguanjia.com/api'
+const host='https://nxr.test.fanyiguanjia.com/api'
 // const host='http://192.168.2.92:9503/api'
 const imghost='https://nxr.fanyiguanjia.com/icon/static/image'
 const title = '暖新人'

pages/Activity/index.vue

@@ -338,10 +338,18 @@ export default {
     }
   },
   onShow(){
+    if(!uni.getStorageSync('token')){
+      uni.navigateTo({url:'/pages/Login/index'})
+      return;
+    }
     this.getDetail(this.id);
   },
   onLoad(option) {
-    this.id = option.id || 0;
+    const obj = uni.getLaunchOptionsSync();
+    let scene = obj.query.scene;
+
+    scene = decodeURIComponent(scene)
+    this.id = option.id || scene || 0;
     this.getDetail(option.id);
     this.getJoinList();
   },

pages/Authentication/done.vue

@@ -185,7 +185,7 @@ export default {
       this.model1.userInfo.sex = e;
     },
     navTo(url) {
-      wx.navigateTo({
+      uni.reLaunch({
         url: url
       })
     },

pages/Authentication/guide.vue

@@ -17,11 +17,11 @@
   <u-image :src="staticImage.fxxGuide7" :lazy-load="true" width="100%" height="auto" mode="widthFix"></u-image>
   <u-image @click="navTo('/pages/Pages/plan?scroll=#cron')" :src="staticImage.fxxGuide8" :lazy-load="true" width="100%" height="auto" mode="widthFix"></u-image>
   <u-image :src="staticImage.fxxGuide9" :lazy-load="true" width="100%" height="auto" mode="widthFix"></u-image>
-  <u-image @click="redirtTo('/pages/Index/index?footCheck=shop&tabCheck=room',true,true)" :src="staticImage.fxxGuide10" :lazy-load="true" width="100%" height="auto" mode="widthFix"></u-image>
+  <u-image @click="reLunchTo('/pages/Index/index?footCheck=shop&tabCheck=room',true,true)" :src="staticImage.fxxGuide10" :lazy-load="true" width="100%" height="auto" mode="widthFix"></u-image>
   <u-image @click="navTo('/pages/Service/index',true)" :src="staticImage.fxxGuide11" :lazy-load="true" width="100%" height="auto" mode="widthFix"></u-image>
-  <u-image @click="redirtTo('/pages/Index/index?footCheck=shop&tabCheck=item',true)" :src="staticImage.fxxGuide12" :lazy-load="true" width="100%" height="auto" mode="widthFix"></u-image>
+  <u-image @click="reLunchTo('/pages/Index/index?footCheck=shop&tabCheck=item',true)" :src="staticImage.fxxGuide12" :lazy-load="true" width="100%" height="auto" mode="widthFix"></u-image>
   <u-image :src="staticImage.fxxGuide13" :lazy-load="true" width="100%" height="auto" mode="widthFix"></u-image>
-  <u-image @click="navTo('/pages/Index/index?footCheck=activity&tabCheck=activity')" :src="staticImage.fxxGuide14" :lazy-load="true" width="100%" height="auto" mode="widthFix"></u-image>
+  <u-image @click="reLunchTo('/pages/Index/index?footCheck=activity&tabCheck=activity')" :src="staticImage.fxxGuide14" :lazy-load="true" width="100%" height="auto" mode="widthFix"></u-image>
   <uv-popup ref="notDone" round="20" :safeAreaInsetBottom="false">
     <view class="not-done-container" style="padding:0 100rpx;">
       <view class="not-done-icon">
@@ -141,6 +141,9 @@ export default {
         })
       }
     },
+    reLunchTo(url){
+      uni.reLaunch({url:url});
+    },
     redirtTo(url,token = false,fxx = false) {
       if(token){
         if(uni.getStorageSync('token')){

pages/Consultant/done.vue

@@ -187,7 +187,7 @@ export default {
       this.model1.userInfo.sex = e;
     },
     navTo(url) {
-      uni.navigateTo({
+      uni.reLaunch({
         url: url
       })
     },

pages/Feed/index.vue

@@ -117,7 +117,7 @@
               height:'80rpx',
               border:'2rpx solid #020b18'
             }"
-              @click="api.navTo('/pages/Feed/leave')"
+              @click="api.navTo('/pages/Feed/leave',true)"
 
           ></u-button>
         </view>
@@ -238,6 +238,12 @@ export default {
     }
   },
   onLoad() {
+    if(!uni.getStorageSync('token')){
+      uni.navigateTo({url:'/pages/Login/index'})
+      return;
+    }
+  },
+  onShow(){
 
   },
   computed: {
@@ -247,6 +253,10 @@ export default {
   },
   methods: {
     submit(){
+      if(!uni.getStorageSync('token')){
+        uni.navigateTo({url:'/pages/Login/index'})
+        return;
+      }
       let file = [];
       this.fileList.forEach(item => {
         file.push({url:item.url})

pages/Index/components/UserPage/index.vue

@@ -379,19 +379,24 @@ export default {
         }
       })
     },
+    reLunchTo(url){
+      uni.navigateTo({
+        url: url
+      })
+    },
     navTo(url, token = false) {
       if (token) {
         if (uni.getStorageSync('token')) {
-          wx.navigateTo({
+          uni.navigateTo({
             url: url
           })
         } else {
-          wx.navigateTo({
+          uni.navigateTo({
             url: '/pages/Login/index'
           })
         }
       } else {
-        wx.navigateTo({
+        uni.navigateTo({
           url: url
         })
       }
@@ -419,7 +424,7 @@ export default {
       uni.removeStorage({key:'address'});
       uni.removeStorage({key:'detailInfo'});
       uni.removeStorage({key:'shopMore'});
-      this.navTo('/pages/Index/index')
+      this.reLunchTo('/pages/Index/index')
     }
   },
   onPageScroll(res) {

pages/Index/index.vue

@@ -67,6 +67,7 @@ import {
   userExtends
 } from "@/api/user";
 import {imghost} from "@/config/host";
+import api from "../../utils/functions";
 
 export default {
   components: {
@@ -116,6 +117,8 @@ export default {
     }
   },
   onLoad(option) {
+    console.log(option)
+    
     if (option.footCheck) {
       this.buttonGroup.forEach((item, index) => {
         if (item.name === option.footCheck) {

pages/Join/done.vue

@@ -132,7 +132,7 @@ export default {
   },
   methods: {
     navTo(url) {
-      uni.navigateTo({
+      uni.reLaunch({
         url: url
       })
     },

pages/ScanCode/done.vue

@@ -99,6 +99,7 @@ export default {
     }
   },
   onLoad(option) {
+
     // this.type = option.type || 'people';
     // this.name = option.name || ''
     // if (this.type === '') {
@@ -132,7 +133,7 @@ export default {
   },
   methods: {
     navTo(url) {
-      uni.navigateTo({
+      uni.reLaunch({
         url: url
       })
     },

pages/ScanCode/index.vue

@@ -23,9 +23,23 @@ export default {
 
   },
   onLoad(option) {
-    this.activityId = option.id;
+    const obj = uni.getLaunchOptionsSync();
+    let scene = obj.query.scene;
+
+    scene = decodeURIComponent(scene)
+
+    this.activityId = option.id || scene;
+    if(!uni.getStorageSync('token')){
+      return;
+    }
     this.signIn();
   },
+  onShow(){
+    if(!uni.getStorageSync('token')){
+      uni.navigateTo({url:'/pages/Login/index'})
+      return;
+    }
+  },
   data() {
     return {
       title: '扫码签到',

uni_modules/uni-combox/components/uni-combox/uni-combox.vue

@@ -131,9 +131,9 @@
 				this.showSelector = true
 			},
 			onBlur() {
-				setTimeout(() => {
-					this.showSelector = false
-				}, 153)
+				// setTimeout(() => {
+				// 	this.showSelector = false
+				// }, 153)
 			},
 			onSelectorClick(index) {
 				this.inputVal = this.filterCandidates[index]
@@ -201,7 +201,7 @@
 		box-sizing: border-box;
 		/* #endif */
 		position: absolute;
-		top: calc(100% + 12px);
+		bottom: calc(100% + 12px);
 		left: 0;
 		width: 100%;
 		background-color: #FFFFFF;
@@ -257,7 +257,7 @@
 
 	.uni-popper__arrow {
 		filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
-		top: -6px;
+		bottom: -6px;
 		left: 10%;
 		margin-right: 3px;
 		border-top-width: 0;